diff --git a/inc/common.inc.php b/inc/common.inc.php
index b68338d7..f8010ca3 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -873,7 +873,6 @@ function hesk_show_notice($message,$title='',$append_colon=true) {
 	<div class="alert alert-warning">
 		<b><?php echo $title; ?></b> <?php echo $message; ?>
 	</div>
-    <br />
 	<?php
 } // END hesk_show_notice()
 
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index 74475d0a..61c28940 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -37,7 +37,23 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 $num_mail = hesk_checkNewMail();
 ?>
+<?php
+// Show a notice if we are in maintenance mode
+if ( hesk_check_maintenance(false) )
+{
+    echo '<div style="margin-bottom: -20px">';
+    hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false);
+    echo '</div>';
+}
 
+// Show a notice if we are in "Knowledgebase only" mode
+if ( hesk_check_kb_only(false) )
+{
+    echo '<div style="margin-bottom: -20px">';
+    hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false);
+    echo '</div>';
+}
+?>
 <div class="enclosing">
     <nav class="navbar navbar-default navbar-static-top" role="navigation">
 	    <div class="navbar-header">
@@ -101,21 +117,3 @@ $num_mail = hesk_checkNewMail();
         </ul>
       </div><!-- /.navbar-collapse -->
     </nav>
-
-    <?php
-    // Show a notice if we are in maintenance mode
-    if ( hesk_check_maintenance(false) )
-    {
-        echo '<div style="padding: 20px 20px 0 20px; margin-bottom: -10px">';
-        hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false);
-        echo '</div>';
-    }
-
-    // Show a notice if we are in "Knowledgebase only" mode
-    if ( hesk_check_kb_only(false) )
-    {
-        echo '<div style="padding: 20px 20px 0 20px; margin-bottom: -10px">';
-        hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false);
-        echo '</div>';
-    }
-    ?>