diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
new file mode 100644
index 00000000..739fae6a
--- /dev/null
+++ b/css/mods-for-hesk-new.css
@@ -0,0 +1,4 @@
+.navbar-nav > .messages-menu > .dropdown-menu >li .menu > li > a,
+.sidebar-menu, .main-sidebar .user-panel, .sidebar-menu > li.header{
+    white-space: normal;
+}
\ No newline at end of file
diff --git a/inc/header_new_admin.inc.php b/inc/header_new_admin.inc.php
index 727957a4..172b5708 100644
--- a/inc/header_new_admin.inc.php
+++ b/inc/header_new_admin.inc.php
@@ -58,6 +58,7 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/skins/_all-skins.min.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css">
     <script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/adminlte.min.js"></script>
diff --git a/inc/new_admin_header_and_sidebar.inc.php b/inc/new_admin_header_and_sidebar.inc.php
index 2324e327..37ff7561 100644
--- a/inc/new_admin_header_and_sidebar.inc.php
+++ b/inc/new_admin_header_and_sidebar.inc.php
@@ -70,6 +70,70 @@ if (hesk_check_kb_only(false)) {
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
                     <!-- Messages: style can be found in dropdown.less-->
+                    <?php
+                    $number_of_maintenance_warnings = 0;
+                    if (hesk_check_maintenance(false)) {
+                        $number_of_maintenance_warnings++;
+                    }
+                    if (hesk_check_kb_only(false)) {
+                        $number_of_maintenance_warnings++;
+                    }
+                    if ($number_of_maintenance_warnings > 0): ?>
+                        <li class="dropdown messages-menu">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                <i class="fa fa-exclamation-triangle"></i>
+                                <span class="label label-warning"><?php echo $number_of_maintenance_warnings; ?></span>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li class="header"><?php echo sprintf($hesklang['x_system_warnings'],
+                                        $number_of_maintenance_warnings,
+                                        $number_of_maintenance_warnings == 1
+                                            ? $hesklang['warning_title_case']
+                                            : $hesklang['warnings_title_case']); ?></li>
+                                <li>
+                                    <ul class="menu">
+                                        <?php if (hesk_check_maintenance(false)): ?>
+                                            <li>
+                                                <a href="#">
+                                                    <h4>
+                                                        <?php echo $hesklang['mma1']; ?>
+                                                    </h4>
+                                                    <p><?php echo $hesklang['mma2']; ?></p>
+                                                </a>
+                                            </li>
+                                        <?php
+                                        endif;
+                                        if (hesk_check_kb_only(false)):
+                                        ?>
+                                            <li>
+                                                <a href="#">
+                                                    <h4>
+                                                        <?php echo $hesklang['kbo1']; ?>
+                                                    </h4>
+                                                    <p><?php echo $hesklang['kbo2']; ?></p>
+                                                </a>
+                                            </li>
+                                        <?php endif; ?>
+                                    </ul>
+                                </li>
+                            </ul>
+                        </li>
+                    <?php endif; ?>
+
+                    <?php
+                    /*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>';
+                    }*/
+                    ?>
                     <li class="dropdown messages-menu">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             <i class="fa fa-envelope-o"></i>
@@ -357,45 +421,64 @@ if (hesk_check_kb_only(false)) {
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
                         $active = 'active';
                     }
-                    echo '<li class="dropdown'.$active.'">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                  <i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '<span class="caret"></span>
-                              </a>
-                              '.$dropdown_items.'
-                          </li>';
                 ?>
                     <li class="<?php echo $active; ?> treeview">
                         <a href="#">
-                            <i class="fa fa-file-text-o" <?php echo $iconDisplay; ?>></i>
-                            <span><?php echo $hesklang['menu_can']; ?></span>
+                            <i class="fa fa-wrench" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['tools']; ?></span>
                         <span class="pull-right-container">
                             <i class="fa fa-angle-left pull-right"></i>
                         </span>
                         </a>
                         <ul class="treeview-menu">
-                            <li>
-                                <a href="manage_canned.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['can_man_canned']; ?></a>
-                            </li>
-                            <li>
-                                <a href="manage_ticket_templates.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['ticket_tpl_man']; ?></a>
-                            </li>
+                            <?php foreach($dropdown_items as $path => $text): ?>
+                                <li>
+                                    <a href="<?php echo $path; ?>.php"><i class="fa fa-circle-o"></i> <?php echo $text; ?></a>
+                                </li>
+                            <?php endforeach; ?>
                         </ul>
                     </li>
-                <?php endif; ?>
-                <li class="treeview">
-                    <a href="#">
-                        <i class="fa fa-files-o"></i>
-                        <span>Layout Options</span>
-                        <span class="pull-right-container">
-                            <span class="label label-primary pull-right">4</span>
-                        </span>
+                <?php
+                elseif (count($dropdown_items) == 1):
+                    $active = '';
+                    if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
+                        $active = 'active';
+                    }
+                    reset($dropdown_items);
+                    $page = key($dropdown_items);
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="<?php echo $page; ?>.php">
+                            <i class="fa fa-wrench" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $dropdown_items[$page]; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+                if (hesk_checkPermission('can_man_settings', 0)):
+                    $active = '';
+                    if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_SETTINGS') {
+                        $active = 'active';
+                    }
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="admin_settings.php">
+                            <i class="fa fa-cog" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['settings']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+                $active = '';
+                if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_PROFILE') {
+                    $active = 'active';
+                }
+                ?>
+                <li class="<?php echo $active; ?> treeview">
+                    <a href="profile.php">
+                        <i class="fa fa-user" <?php echo $iconDisplay; ?>></i>
+                        <span><?php echo $hesklang['menu_profile']; ?></span>
                     </a>
-                    <ul class="treeview-menu">
-                        <li><a href="pages/layout/top-nav.html"><i class="fa fa-circle-o"></i> Top Navigation</a></li>
-                        <li><a href="pages/layout/boxed.html"><i class="fa fa-circle-o"></i> Boxed</a></li>
-                        <li><a href="pages/layout/fixed.html"><i class="fa fa-circle-o"></i> Fixed</a></li>
-                        <li><a href="pages/layout/collapsed-sidebar.html"><i class="fa fa-circle-o"></i> Collapsed Sidebar</a></li>
-                    </ul>
                 </li>
             </ul>
         </section>
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index 56fcf4e9..2c7ead5d 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -64,91 +64,6 @@ if (hesk_check_kb_only(false)) {
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav">
                 <?php
-                $tools_count = 0;
-                $dropdown_items = '<ul class="dropdown-menu" role="menu">';
-                if (hesk_checkPermission('can_ban_emails', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="banned_emails.php">' . $hesklang['manage_banned_emails'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_ban_ips', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="banned_ips.php">' . $hesklang['manage_banned_ips'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_service_msg', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="service_messages.php">' . $hesklang['manage_service_messages'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_man_email_tpl', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="manage_email_templates.php">' . $hesklang['manage_email_templates'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="manage_statuses.php">' . $hesklang['manage_statuses'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_view_logs', 0)) {
-                    $tools_count++;
-                    $dropdown_items .= '<li><a href="view_message_log.php">' . $hesklang['view_message_log'] . '</a></li>';
-                }
-                $dropdown_items .= '</ul>';
-
-                if ($tools_count > 1) {
-                    $active = '';
-                    if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                        $active = ' active';
-                    }
-                    echo '<li class="dropdown'.$active.'">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                  <i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '<span class="caret"></span>
-                              </a>
-                              '.$dropdown_items.'
-                          </li>';
-                } else {
-                    if (hesk_checkPermission('can_ban_emails', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="banned_emails.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    } elseif (hesk_checkPermission('can_ban_ips', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="banned_ips.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    } elseif (hesk_checkPermission('can_service_msg', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="service_messages.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    } elseif (hesk_checkPermission('can_man_email_tpl', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="manage_email_templates.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    } elseif (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="manage_statuses.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    } elseif (hesk_checkPermission('can_view_logs', 0)) {
-                        $active = '';
-                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                            $active = ' class="active"';
-                        }
-                        echo '<li'.$active.'><a href="view_message_log.php"><i class="fa fa-wrench" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['tools'] . '</a></li>';
-                    }
-                }
-                if (hesk_checkPermission('can_man_settings', 0)) {
-                    $active = '';
-                    if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_SETTINGS') {
-                        $active = ' class="active"';
-                    }
-                    echo '<li'.$active.'><a href="admin_settings.php"><i class="fa fa-cog" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['settings'] . '</a></li>';
-                }
 
                 $active = '';
                 if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_PROFILE') {
diff --git a/language/en/text.php b/language/en/text.php
index 3b7d07ea..8c8f1cb6 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -27,6 +27,8 @@ $hesklang['message_lower_case'] = 'message';
 $hesklang['messages_lower_case'] = 'messages';
 $hesklang['deleted_user_title_case'] = 'Deleted User';
 $hesklang['main_navigation_uppercase'] = 'MAIN NAVIGATION';
+$hesklang['x_system_warnings'] = '%s System %s'; // %s: Number of warnings, $s: "Warning" or "Warnings", depending on #
+$hesklang['warnings_title_case'] = 'Warnings';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.6.0
 $hesklang['search_logs'] = 'Search Logs';
@@ -1816,7 +1818,7 @@ $hesklang['ekb_y']='<b>YES</b>, enable Knowledgebase';
 $hesklang['ekb_o']='<b>YES</b>, use HESK as a Knowledgebase only (<i>disable help desk</i>)';
 $hesklang['kb_set']='Knowledgebase settings';
 $hesklang['kbo1']='Knowledgebase-only mode';
-$hesklang['kbo2']='<br /><br />Visitors cannot submit new support tickets and are taken directly to the knowledgebase.';
+$hesklang['kbo2']='Visitors cannot submit new support tickets and are taken directly to the knowledgebase.';
 $hesklang['fpass']='Forgot your password?';
 $hesklang['passr']='Password reset';
 $hesklang['passa']='Allow users to reset a forgot password over email';