diff --git a/admin/dashboard.php b/admin/dashboard.php
index ee0921c..6da0abb 100644
--- a/admin/dashboard.php
+++ b/admin/dashboard.php
@@ -38,7 +38,7 @@ Template::render_header(_("Dashboard"), true);
         <div class="line text-muted"></div>
         <h3><?php echo _("New incident");?></h3>
         <form id="new-incident" action="<?php echo WEB_URL;?>/admin/?new=incident" method="POST" class="clearfix">
-        <article class="panel">
+        <div class="panel">
           <?php if (isset($message))
           {?>
           <p class="alert alert-danger"><?php echo $message?></p>
@@ -63,8 +63,8 @@ Template::render_header(_("Dashboard"), true);
           }
           ?>
           </div>
-        </article>
-          <article class="panel new panel-primary">
+        </div>
+          <div class="panel new panel-primary">
             <div class="panel-heading icon">
               <i class="glyphicon glyphicon-info-sign"></i>
             </div>
@@ -77,7 +77,7 @@ Template::render_header(_("Dashboard"), true);
             <div class="panel-footer clearfix">
               <small><?php echo _("Posted by");?>: <?php echo $user->get_username();?> <span class="pull-right" id="end_time_wrapper"><?php echo _("Ending");?>:&nbsp;<input id="end_time" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="end_time" class="pull-right" placeholder="<?php echo _("End time");?>" value="<?php echo (isset($_POST['end_time'])?htmlspecialchars($_POST['end_time']):''); ?>"></span></small>
             </div>
-          </article>
+          </div>
           <select class="form-control pull-left" id="type" name="type">
             <?php 
             if (isset($_POST['type']))
diff --git a/classes/incident.php b/classes/incident.php
index e00a0e5..11d8157 100644
--- a/classes/incident.php
+++ b/classes/incident.php
@@ -176,7 +176,7 @@ class Incident
         <div class="panel-footer clearfix">
           <small><?php echo _("Posted by");?>: <?php echo $this->username; 
           if (isset($this->end_date)){?> 
-            <span class="pull-right"><?php echo strtotime($this->end_date)>time()?_("Ending"):_("Ended");?>: <time class="pull-right timeago" datetime="<?php echo $this->end_date; ?>"><?php echo $this->end_date; ?></time></span>
+            <span class="pull-right"><?php echo strtotime($this->end_date)>time()?_("Ending"):_("Ended");?>:&nbsp;<time class="pull-right timeago" datetime="<?php echo $this->end_date; ?>"><?php echo $this->end_date; ?></time></span>
             <?php } ?>
           </small>
         </div>
diff --git a/template.php b/template.php
index 2f4fb76..abf7be4 100644
--- a/template.php
+++ b/template.php
@@ -137,7 +137,7 @@ class Template{
                 <span class="caret"></span>
                 <span class="sr-only"><?php echo _("Toggle Dropdown");?></span>
               </button>
-              <ul class="dropdown-menu">
+              <div class="dropdown-menu">
                 <?php 
                 foreach ($lang_names as $key => $value) {
                   echo '<a href="?lang='.$key.'"><img src="'.WEB_URL.'/locale/'.$key.'/flag.png" alt="'.$value.'">'.$value.'</a>';
@@ -145,7 +145,7 @@ class Template{
                 ?>
                 <hr role="separator" class="divider">
                 <a href="https://poeditor.com/join/project/37SpmJtyOm"><?php echo _("Help with translation!");?></a>
-              </ul>
+              </div>
             </div>
           </div>
           <div class="col-md-4 text-right"><a href="https://github.com/Pryx/server-status/" target="_blank"><i class="fa fa-github" aria-hidden="true"></i></a></div>