diff --git a/admin/admin_main.php b/admin/admin_main.php
index 48126683..b5d53cdd 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -41,6 +41,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -53,50 +54,51 @@ define('PAGE_TITLE', 'ADMIN_HOME');
 
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
-
-/* Print admin navigation */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
+/* Reset default settings? */
+if (isset($_GET['reset']) && hesk_token_check()) {
+    $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1");
+    $_SESSION['default_list'] = '';
+} /* Get default settings */
+else {
+    parse_str($_SESSION['default_list'], $defaults);
+    $_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults;
+}
+
 ?>
-
-<div class="row">
-    <div class="col-md-12 pad-down-20">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-
-        /* Print tickets? */
-        if (hesk_checkPermission('can_view_tickets', 0)) {
-            if (!isset($_SESSION['hide']['ticket_list']))  //Number of tickets (table header. NOT ACTUAL TABLE)
-            {
-                echo '
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4>' . $hesklang['open_tickets'] . ' <span class="nu-floatRight panel-button"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> ' . $hesklang['nti'] . '</a></span></h4>
-                    </div>'; // The rest of the panel will be printed by print_tickets.inc.php
+<section class="content">
+    <?php hesk_handle_messages(); ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['tickets']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php
+            /* Print tickets? */
+            if (hesk_checkPermission('can_view_tickets', 0)) {
+                /* Print the list of tickets */
+                require(HESK_PATH . 'inc/print_tickets.inc.php');
+                echo '<br>';
+                /* Print forms for listing and searching tickets */
+                require(HESK_PATH . 'inc/show_search_form.inc.php');
+            } else {
+                echo '<p><i>' . $hesklang['na_view_tickets'] . '</i></p>';
             }
-
-            /* Reset default settings? */
-            if (isset($_GET['reset']) && hesk_token_check()) {
-                $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `default_list`='' WHERE `id` = '" . intval($_SESSION['id']) . "' LIMIT 1");
-                $_SESSION['default_list'] = '';
-            } /* Get default settings */
-            else {
-                parse_str($_SESSION['default_list'], $defaults);
-                $_GET = isset($_GET) && is_array($_GET) ? array_merge($_GET, $defaults) : $defaults;
-            }
-
-            /* Print the list of tickets */
-            require(HESK_PATH . 'inc/print_tickets.inc.php');
-
-            echo "&nbsp;<br />";
-
-            /* Print forms for listing and searching tickets */
-            require(HESK_PATH . 'inc/show_search_form.inc.php');
-        } else {
-            echo '<p><i>' . $hesklang['na_view_tickets'] . '</i></p>';
-        }
-
-        $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
+            ?>
+        </div>
+    </div>
+    <div class="box">
+        <div class="box-body">
+            <?php
+            $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
         CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
         SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
         SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
@@ -114,13 +116,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
         C9wPic7DQp9DQo=', "\112");
 
-        echo '<hr />&nbsp;<br />';
-
-        /* Clean unneeded session variables */
-        hesk_cleanSessionVars('hide');
-        ?>
+            /* Clean unneeded session variables */
+            hesk_cleanSessionVars('hide');
+            ?>
+        </div>
     </div>
-</div>
+</section>
 
 <?php
 
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index b19f7018..6e337207 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -46,6 +46,7 @@ $hesk_settings['language_default'] = $hesk_settings['language'];
 require(HESK_PATH . 'inc/common.inc.php');
 $hesk_settings['language'] = $hesk_settings['language_default'];
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -90,12 +91,314 @@ if (defined('HESK_DEMO')) {
     $hesk_settings['recaptcha_private_key'] = $hesklang['hdemo'];
 }
 
-?>
+// Check file attachment limits
+if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
+    // Check number of attachments per post
+    if (version_compare(phpversion(), '5.2.12', '>=') && @ini_get('max_file_uploads') && @ini_get('max_file_uploads') < $hesk_settings['attachments']['max_number']) {
+        hesk_show_notice($hesklang['fatte1']);
+    }
 
-<div class="row move-down-20">
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading"><?php echo $hesklang['installation_information']; ?></div>
+    // Check max attachment size
+    $tmp = @ini_get('upload_max_filesize');
+    if ($tmp) {
+        $last = strtoupper(substr($tmp, -1));
+
+        switch ($last) {
+            case 'K':
+                $tmp = $tmp * 1024;
+                break;
+            case 'M':
+                $tmp = $tmp * 1048576;
+                break;
+            case 'G':
+                $tmp = $tmp * 1073741824;
+                break;
+            default:
+                $tmp = $tmp;
+        }
+
+        if ($tmp < $hesk_settings['attachments']['max_size']) {
+            hesk_show_notice($hesklang['fatte2']);
+        }
+    }
+
+    // Check max post size
+    $tmp = @ini_get('post_max_size');
+    if ($tmp) {
+        $last = strtoupper(substr($tmp, -1));
+
+        switch ($last) {
+            case 'K':
+                $tmp = $tmp * 1024;
+                break;
+            case 'M':
+                $tmp = $tmp * 1048576;
+                break;
+            case 'G':
+                $tmp = $tmp * 1073741824;
+                break;
+            default:
+                $tmp = $tmp;
+        }
+
+        if ($tmp < ($hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288)) {
+            hesk_show_notice($hesklang['fatte3']);
+        }
+    }
+}
+
+
+$hesklang['err_custname'] = addslashes($hesklang['err_custname']);
+
+$modsForHesk_settings = mfh_getSettings();
+?>
+<script language="javascript" type="text/javascript"><!--
+    function hesk_checkFields() {
+        d = document.form1;
+
+        // GENERAL
+        if (d.s_site_title.value == '') {
+            alert('<?php echo addslashes($hesklang['err_sname']); ?>');
+            return false;
+        }
+        if (d.s_site_url.value == '') {
+            alert('<?php echo addslashes($hesklang['err_surl']); ?>');
+            return false;
+        }
+        if (d.s_webmaster_mail.value == '' || d.s_webmaster_mail.value.indexOf(".") == -1 || d.s_webmaster_mail.value.indexOf("@") == -1) {
+            alert('<?php echo addslashes($hesklang['err_wmmail']); ?>');
+            return false;
+        }
+        if (d.s_noreply_mail.value == '' || d.s_noreply_mail.value.indexOf(".") == -1 || d.s_noreply_mail.value.indexOf("@") == -1) {
+            alert('<?php echo addslashes($hesklang['err_nomail']); ?>');
+            return false;
+        }
+
+        if (d.s_db_host.value == '') {
+            alert('<?php echo addslashes($hesklang['err_dbhost']); ?>');
+            return false;
+        }
+        if (d.s_db_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_dbname']); ?>');
+            return false;
+        }
+        if (d.s_db_user.value == '') {
+            alert('<?php echo addslashes($hesklang['err_dbuser']); ?>');
+            return false;
+        }
+        if (d.s_db_pass.value == '') {
+            if (!confirm('<?php echo addslashes($hesklang['mysql_root']); ?>')) {
+                return false;
+            }
+        }
+
+        // HELPDESK
+        if (d.s_hesk_title.value == '') {
+            alert('<?php echo addslashes($hesklang['err_htitle']); ?>');
+            return false;
+        }
+        if (d.s_hesk_url.value == '') {
+            alert('<?php echo addslashes($hesklang['err_hurl']); ?>');
+            return false;
+        }
+        if (d.s_max_listings.value == '') {
+            alert('<?php echo addslashes($hesklang['err_max']); ?>');
+            return false;
+        }
+        if (d.s_print_font_size.value == '') {
+            alert('<?php echo addslashes($hesklang['err_psize']); ?>');
+            return false;
+        }
+
+        // KNOWLEDGEBASE
+
+        // MISC
+
+        // CUSTOM FIELDS
+        if (d.s_custom1_use.checked && d.s_custom1_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom2_use.checked && d.s_custom2_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom3_use.checked && d.s_custom3_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom4_use.checked && d.s_custom4_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom5_use.checked && d.s_custom5_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom6_use.checked && d.s_custom6_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom7_use.checked && d.s_custom7_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom8_use.checked && d.s_custom8_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom9_use.checked && d.s_custom9_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom10_use.checked && d.s_custom10_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom11_use.checked && d.s_custom11_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom12_use.checked && d.s_custom12_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom13_use.checked && d.s_custom13_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom14_use.checked && d.s_custom14_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom15_use.checked && d.s_custom15_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom16_use.checked && d.s_custom16_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom17_use.checked && d.s_custom17_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom18_use.checked && d.s_custom18_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom19_use.checked && d.s_custom19_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+        if (d.s_custom20_use.checked && d.s_custom20_name.value == '') {
+            alert('<?php echo addslashes($hesklang['err_custname']); ?>');
+            return false;
+        }
+
+
+        // DISABLE SUBMIT BUTTON
+        d.submitbutton.disabled = true;
+        d.submitbutton.value = '<?php echo addslashes($hesklang['saving']); ?>';
+
+        return true;
+    }
+
+    function hesk_customOptions(cID, fID, fTYPE, maxlenID, oldTYPE) {
+        var t = document.getElementById(fTYPE).value;
+        if (t == oldTYPE) {
+            var d = document.getElementById(fID).value;
+            var m = document.getElementById(maxlenID).value;
+        }
+        else {
+            var d = '';
+            var m = 255;
+        }
+        var myURL = "options.php?i=" + cID + "&q=" + encodeURIComponent(d) + "&t=" + t + "&m=" + m;
+        window.open(myURL, "Hesk_window", "height=400,width=500,menubar=0,location=0,toolbar=0,status=0,resizable=1,scrollbars=1");
+        return false;
+    }
+
+    function hesk_toggleLayer(nr, setto) {
+        if (document.all)
+            document.all[nr].style.display = setto;
+        else if (document.getElementById)
+            document.getElementById(nr).style.display = setto;
+    }
+
+    function hesk_testLanguage() {
+        window.open('admin_settings.php?test_languages=1', "Hesk_window", "height=400,width=500,menubar=0,location=0,toolbar=0,status=0,resizable=1,scrollbars=1");
+        return false;
+    }
+
+    var tabberOptions = {
+
+        'cookie': "tabber",
+        'onLoad': function (argsObj) {
+            var t = argsObj.tabber;
+            var i;
+            if (t.id) {
+                t.cookie = t.id + t.cookie;
+            }
+
+            i = parseInt(getCookie(t.cookie));
+            if (isNaN(i)) {
+                return;
+            }
+            t.tabShow(i);
+        },
+
+        'onClick': function (argsObj) {
+            var c = argsObj.tabber.cookie;
+            var i = argsObj.index;
+            setCookie(c, i);
+        }
+    };
+
+    var server_time = "<?php echo $server_time; ?>";
+    var today = new Date();
+    today.setHours(server_time.substr(0, server_time.indexOf(":")));
+    today.setMinutes(server_time.substr(server_time.indexOf(":") + 1));
+
+    function startTime() {
+        var h = today.getHours();
+        var m = today.getMinutes();
+        var s = today.getSeconds();
+
+        h = checkTime(h);
+        m = checkTime(m);
+
+        document.getElementById('servertime').innerHTML = h + ":" + m;
+        s = s + 1;
+        today.setSeconds(s);
+        t = setTimeout('startTime()', 1000);
+    }
+
+    function checkTime(i) {
+        if (i < 10) {
+            i = "0" + i;
+        }
+        return i;
+    }
+    //-->
+</script>
+<section class="content">
+    <?php
+    /* This will handle error, success and notice messages */
+    hesk_handle_messages();
+    ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['installation_information']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
             <table class="table table-striped">
                 <tr>
                     <td class="text-right">
@@ -242,1887 +545,1607 @@ if (defined('HESK_DEMO')) {
             </table>
         </div>
     </div>
-    <div class="col-md-8">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
+    <h2>
+        <?php echo $hesklang['settings']; ?>
+        <a href="javascript:void(0)"
+           onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['settings_intro']) . '\n\n' . hesk_makeJsString($hesklang['all_req']); ?>')"><i
+                class="fa fa-question-circle settingsquestionmark"></i></a>
+    </h2>
+    <form method="post" action="admin_settings_save.php" name="form1" onsubmit="return hesk_checkFields()"
+          class="form-horizontal" role="form">
 
-        // Check file attachment limits
-        if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
-            // Check number of attachments per post
-            if (version_compare(phpversion(), '5.2.12', '>=') && @ini_get('max_file_uploads') && @ini_get('max_file_uploads') < $hesk_settings['attachments']['max_number']) {
-                hesk_show_notice($hesklang['fatte1']);
-            }
+        <!-- General Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_1']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['gs']; ?></h4>
 
-            // Check max attachment size
-            $tmp = @ini_get('upload_max_filesize');
-            if ($tmp) {
-                $last = strtoupper(substr($tmp, -1));
+                <div class="form-group">
+                    <label for="s_site_title" class="col-sm-3 control-label"><?php echo $hesklang['wbst_title']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#1','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                switch ($last) {
-                    case 'K':
-                        $tmp = $tmp * 1024;
-                        break;
-                    case 'M':
-                        $tmp = $tmp * 1048576;
-                        break;
-                    case 'G':
-                        $tmp = $tmp * 1073741824;
-                        break;
-                    default:
-                        $tmp = $tmp;
-                }
-
-                if ($tmp < $hesk_settings['attachments']['max_size']) {
-                    hesk_show_notice($hesklang['fatte2']);
-                }
-            }
-
-            // Check max post size
-            $tmp = @ini_get('post_max_size');
-            if ($tmp) {
-                $last = strtoupper(substr($tmp, -1));
-
-                switch ($last) {
-                    case 'K':
-                        $tmp = $tmp * 1024;
-                        break;
-                    case 'M':
-                        $tmp = $tmp * 1048576;
-                        break;
-                    case 'G':
-                        $tmp = $tmp * 1073741824;
-                        break;
-                    default:
-                        $tmp = $tmp;
-                }
-
-                if ($tmp < ($hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288)) {
-                    hesk_show_notice($hesklang['fatte3']);
-                }
-            }
-        }
-
-
-        $hesklang['err_custname'] = addslashes($hesklang['err_custname']);
-
-        $modsForHesk_settings = mfh_getSettings();
-        ?>
-        <script language="javascript" type="text/javascript"><!--
-            function hesk_checkFields() {
-                d = document.form1;
-
-                // GENERAL
-                if (d.s_site_title.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_sname']); ?>');
-                    return false;
-                }
-                if (d.s_site_url.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_surl']); ?>');
-                    return false;
-                }
-                if (d.s_webmaster_mail.value == '' || d.s_webmaster_mail.value.indexOf(".") == -1 || d.s_webmaster_mail.value.indexOf("@") == -1) {
-                    alert('<?php echo addslashes($hesklang['err_wmmail']); ?>');
-                    return false;
-                }
-                if (d.s_noreply_mail.value == '' || d.s_noreply_mail.value.indexOf(".") == -1 || d.s_noreply_mail.value.indexOf("@") == -1) {
-                    alert('<?php echo addslashes($hesklang['err_nomail']); ?>');
-                    return false;
-                }
-
-                if (d.s_db_host.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_dbhost']); ?>');
-                    return false;
-                }
-                if (d.s_db_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_dbname']); ?>');
-                    return false;
-                }
-                if (d.s_db_user.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_dbuser']); ?>');
-                    return false;
-                }
-                if (d.s_db_pass.value == '') {
-                    if (!confirm('<?php echo addslashes($hesklang['mysql_root']); ?>')) {
-                        return false;
-                    }
-                }
-
-                // HELPDESK
-                if (d.s_hesk_title.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_htitle']); ?>');
-                    return false;
-                }
-                if (d.s_hesk_url.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_hurl']); ?>');
-                    return false;
-                }
-                if (d.s_max_listings.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_max']); ?>');
-                    return false;
-                }
-                if (d.s_print_font_size.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_psize']); ?>');
-                    return false;
-                }
-
-                // KNOWLEDGEBASE
-
-                // MISC
-
-                // CUSTOM FIELDS
-                if (d.s_custom1_use.checked && d.s_custom1_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom2_use.checked && d.s_custom2_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom3_use.checked && d.s_custom3_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom4_use.checked && d.s_custom4_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom5_use.checked && d.s_custom5_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom6_use.checked && d.s_custom6_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom7_use.checked && d.s_custom7_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom8_use.checked && d.s_custom8_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom9_use.checked && d.s_custom9_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom10_use.checked && d.s_custom10_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom11_use.checked && d.s_custom11_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom12_use.checked && d.s_custom12_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom13_use.checked && d.s_custom13_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom14_use.checked && d.s_custom14_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom15_use.checked && d.s_custom15_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom16_use.checked && d.s_custom16_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom17_use.checked && d.s_custom17_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom18_use.checked && d.s_custom18_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom19_use.checked && d.s_custom19_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-                if (d.s_custom20_use.checked && d.s_custom20_name.value == '') {
-                    alert('<?php echo addslashes($hesklang['err_custname']); ?>');
-                    return false;
-                }
-
-
-                // DISABLE SUBMIT BUTTON
-                d.submitbutton.disabled = true;
-                d.submitbutton.value = '<?php echo addslashes($hesklang['saving']); ?>';
-
-                return true;
-            }
-
-            function hesk_customOptions(cID, fID, fTYPE, maxlenID, oldTYPE) {
-                var t = document.getElementById(fTYPE).value;
-                if (t == oldTYPE) {
-                    var d = document.getElementById(fID).value;
-                    var m = document.getElementById(maxlenID).value;
-                }
-                else {
-                    var d = '';
-                    var m = 255;
-                }
-                var myURL = "options.php?i=" + cID + "&q=" + encodeURIComponent(d) + "&t=" + t + "&m=" + m;
-                window.open(myURL, "Hesk_window", "height=400,width=500,menubar=0,location=0,toolbar=0,status=0,resizable=1,scrollbars=1");
-                return false;
-            }
-
-            function hesk_toggleLayer(nr, setto) {
-                if (document.all)
-                    document.all[nr].style.display = setto;
-                else if (document.getElementById)
-                    document.getElementById(nr).style.display = setto;
-            }
-
-            function hesk_testLanguage() {
-                window.open('admin_settings.php?test_languages=1', "Hesk_window", "height=400,width=500,menubar=0,location=0,toolbar=0,status=0,resizable=1,scrollbars=1");
-                return false;
-            }
-
-            var tabberOptions = {
-
-                'cookie': "tabber",
-                'onLoad': function (argsObj) {
-                    var t = argsObj.tabber;
-                    var i;
-                    if (t.id) {
-                        t.cookie = t.id + t.cookie;
-                    }
-
-                    i = parseInt(getCookie(t.cookie));
-                    if (isNaN(i)) {
-                        return;
-                    }
-                    t.tabShow(i);
-                },
-
-                'onClick': function (argsObj) {
-                    var c = argsObj.tabber.cookie;
-                    var i = argsObj.index;
-                    setCookie(c, i);
-                }
-            };
-
-            var server_time = "<?php echo $server_time; ?>";
-            var today = new Date();
-            today.setHours(server_time.substr(0, server_time.indexOf(":")));
-            today.setMinutes(server_time.substr(server_time.indexOf(":") + 1));
-
-            function startTime() {
-                var h = today.getHours();
-                var m = today.getMinutes();
-                var s = today.getSeconds();
-
-                h = checkTime(h);
-                m = checkTime(m);
-
-                document.getElementById('servertime').innerHTML = h + ":" + m;
-                s = s + 1;
-                today.setSeconds(s);
-                t = setTimeout('startTime()', 1000);
-            }
-
-            function checkTime(i) {
-                if (i < 10) {
-                    i = "0" + i;
-                }
-                return i;
-            }
-            //-->
-        </script>
-
-        <h3><?php echo $hesklang['settings']; ?> <a href="javascript:void(0)"
-                                                    onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['settings_intro']) . '\n\n' . hesk_makeJsString($hesklang['all_req']); ?>')"><i
-                    class="fa fa-question-circle settingsquestionmark"></i></a></h3>
-
-        <div class="footerWithBorder blankSpace"></div>
-
-        <form method="post" action="admin_settings_save.php" name="form1" onsubmit="return hesk_checkFields()"
-              class="form-horizontal" role="form">
-            <!-- Nav tabs -->
-            <ul class="nav nav-tabs">
-                <li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li>
-                <li><a href="#helpdesk" data-toggle="tab"><?php echo $hesklang['tab_2']; ?></a></li>
-                <li><a href="#knowledgebase" data-toggle="tab"><?php echo $hesklang['tab_3']; ?></a></li>
-                <li>
-                    <a href="#calendar" data-toggle="tab"><?php echo $hesklang['calendar_title_case']; ?>
-                        <span class="label label-primary" data-toggle="tooltip"
-                              title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>">
-                            <?php echo $hesklang['mods_for_hesk_acronym']; ?>
-                        </span>
-                    </a>
-                </li>
-                <li><a href="#customFields" data-toggle="tab"><?php echo $hesklang['tab_4']; ?></a></li>
-                <li><a href="#email" data-toggle="tab"><?php echo $hesklang['tab_6']; ?></a></li>
-                <li><a href="#ticket-list" data-toggle="tab"><?php echo $hesklang['tab_7']; ?></a></li>
-                <li><a href="#misc" data-toggle="tab"><?php echo $hesklang['tab_5']; ?></a></li>
-                <li><a href="#colors" data-toggle="tab"><?php echo $hesklang['uiColors']; ?></a></li>
-            </ul>
-
-            <!-- Tab panes -->
-            <div class="tab-content summaryList tabPadding">
-                <!-- General Settings -->
-                <div class="tab-pane fade in active" id="general">
-                    <h6 class="bold"><?php echo $hesklang['gs']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_site_title" class="col-sm-3 control-label"><?php echo $hesklang['wbst_title']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#1','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="s_site_title" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['site_title']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['wbst_title']); ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="s_site_title" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['site_title']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['wbst_title']); ?>"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_site_url" class="col-sm-3 control-label"><?php echo $hesklang['wbst_url']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#2','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_site_url" class="col-sm-3 control-label"><?php echo $hesklang['wbst_url']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#2','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="s_site_url" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['site_url']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['wbst_url']); ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="s_site_url" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['site_url']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['wbst_url']); ?>"/>
                     </div>
-                    <div class="form-group">
-                        <label for="navbar_title_url" class="col-sm-3 control-label">
+                </div>
+                <div class="form-group">
+                    <label for="navbar_title_url" class="col-sm-3 control-label">
                                 <span class="label label-primary"
                                       data-toggle="tooltip"
                                       title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['navbar_title_url']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['navbar_title_url']; ?>"
-                               data-content="<?php echo $hesklang['navbar_title_url_help']; ?>"></i>
-                        </label>
+                        <?php echo $hesklang['navbar_title_url']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['navbar_title_url']; ?>"
+                           data-content="<?php echo $hesklang['navbar_title_url_help']; ?>"></i>
+                    </label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="navbar_title_url" size="40" maxlength="255"
-                                   value="<?php echo $modsForHesk_settings['navbar_title_url']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['navbar_title_url']); ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="navbar_title_url" size="40" maxlength="255"
+                               value="<?php echo $modsForHesk_settings['navbar_title_url']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['navbar_title_url']); ?>"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_webmaster_email"
-                               class="col-sm-3 control-label"><?php echo $hesklang['email_wm']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#4','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_webmaster_email"
+                           class="col-sm-3 control-label"><?php echo $hesklang['email_wm']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#4','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="s_webmaster_mail" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['webmaster_mail']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['email_wm']); ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="s_webmaster_mail" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['webmaster_mail']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['email_wm']); ?>"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_noreply_mail"
-                               class="col-sm-3 control-label"><?php echo $hesklang['email_noreply']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#5','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_noreply_mail"
+                           class="col-sm-3 control-label"><?php echo $hesklang['email_noreply']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#5','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="s_noreply_mail" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['noreply_mail']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['email_noreply']); ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="s_noreply_mail" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['noreply_mail']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['email_noreply']); ?>"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_noreply_name"
-                               class="col-sm-3 control-label"><?php echo $hesklang['email_name']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#6','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_noreply_name"
+                           class="col-sm-3 control-label"><?php echo $hesklang['email_name']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#6','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="s_noreply_name" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['noreply_name']; ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['email_name']); ?>"/>
-                        </div>
-                    </div>
-
-                    <h6 class="bold"><?php echo $hesklang['lgs']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-                    <div class="form-group">
-                        <label for="s_language" class="col-sm-3 control-label"><?php echo $hesklang['hesk_lang']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#9','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <select class="form-control" name="s_language">
-                                <?php echo hesk_testLanguage(1); ?>
-                            </select>
-                            &nbsp;
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:return hesk_testLanguage()"><?php echo $hesklang['s_inl']; ?></a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_mlang" class="col-sm-3 control-label"><?php echo $hesklang['s_mlang']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#43','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <?php
-                            $on = $hesk_settings['can_sel_lang'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['can_sel_lang'] ? '' : 'checked="checked"';
-                            echo '
-                        <div class="radio"><label><input type="radio" name="s_can_sel_lang" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>
-                        <div class="radio"><label><input type="radio" name="s_can_sel_lang" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                            ?>
-                        </div>
-                    </div>
-
-                    <h6 class="bold"><?php echo $hesklang['db']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_db_host" class="col-sm-3 control-label"><?php echo $hesklang['db_host']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#32','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['db_host']); ?>" type="text"
-                                   name="s_db_host" id="m1" size="40" maxlength="255"
-                                   value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_host']; ?>"
-                                   autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_db_name" class="col-sm-3 control-label"><?php echo $hesklang['db_name']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#33','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['db_name']); ?>" name="s_db_name"
-                                   id="m2" size="40" maxlength="255"
-                                   value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_name']; ?>"
-                                   autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_db_user" class="col-sm-3 control-label"><?php echo $hesklang['db_user']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#34','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['db_user']); ?>" name="s_db_user"
-                                   id="m3" size="40" maxlength="255"
-                                   value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_user']; ?>"
-                                   autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_db_pass" class="col-sm-3 control-label"><?php echo $hesklang['db_pass']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#35','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['db_pass']); ?>" name="s_db_pass"
-                                   id="m4" size="40" maxlength="255"
-                                   value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_pass']; ?>"
-                                   autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_db_pfix" class="col-sm-3 control-label"><?php echo $hesklang['prefix']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#36','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['prefix']); ?>" name="s_db_pfix"
-                                   id="m5" size="40" maxlength="255"
-                                   value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_pfix']; ?>"
-                                   autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-9 col-sm-offset-3">
-                            <input type="button" class="btn btn-default move-down-4" onclick="hesk_testMySQL()"
-                                   value="<?php echo $hesklang['mysqltest']; ?>"/>
-                            <!-- START MYSQL TEST -->
-                            <div id="mysql_test" style="display: none">
-                            </div>
-
-                            <script language="Javascript" type="text/javascript">
-                                function hesk_testMySQL() {
-                                    var element = document.getElementById('mysql_test');
-                                    element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
-                                    element.style.display = 'block';
-
-                                    var s_db_host = document.getElementById('m1').value;
-                                    var s_db_name = document.getElementById('m2').value;
-                                    var s_db_user = document.getElementById('m3').value;
-                                    var s_db_pass = document.getElementById('m4').value;
-                                    var s_db_pfix = document.getElementById('m5').value;
-
-                                    var params = "test=mysql" +
-                                        "&s_db_host=" + encodeURIComponent(s_db_host) +
-                                        "&s_db_name=" + encodeURIComponent(s_db_name) +
-                                        "&s_db_user=" + encodeURIComponent(s_db_user) +
-                                        "&s_db_pass=" + encodeURIComponent(s_db_pass) +
-                                        "&s_db_pfix=" + encodeURIComponent(s_db_pfix);
-
-                                    xmlHttp = GetXmlHttpObject();
-                                    if (xmlHttp == null) {
-                                        return;
-                                    }
-
-                                    xmlHttp.open('POST', 'test_connection.php', true);
-                                    xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                                    xmlHttp.setRequestHeader("Content-length", params.length);
-                                    xmlHttp.setRequestHeader("Connection", "close");
-
-                                    xmlHttp.onreadystatechange = function () {
-                                        if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-                                            element.innerHTML = xmlHttp.responseText;
-                                        }
-                                    }
-
-                                    xmlHttp.send(params);
-                                }
-                            </script>
-                            <!-- END MYSQL TEST -->
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="s_noreply_name" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['noreply_name']; ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['email_name']); ?>"/>
                     </div>
                 </div>
 
-                <!-- Helpdesk Settings -->
-                <div class="tab-pane fade in" id="helpdesk">
-                    <h6 class="bold"><?php echo $hesklang['hd']; ?></h6>
+                <h4 class="bold"><?php echo $hesklang['lgs']; ?></h4>
 
-                    <div class="footerWithBorder blankSpace"></div>
+                <div class="footerWithBorder blankSpace"></div>
+                <div class="form-group">
+                    <label for="s_language" class="col-sm-3 control-label"><?php echo $hesklang['hesk_lang']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#9','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="form-group">
-                        <label for="s_hesk_title" class="col-sm-3 control-label"><?php echo $hesklang['hesk_title']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#6','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['hesk_title']); ?>"
-                                   name="s_hesk_title" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['hesk_title']; ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <select class="form-control" name="s_language">
+                            <?php echo hesk_testLanguage(1); ?>
+                        </select>
+                        &nbsp;
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:return hesk_testLanguage()"><?php echo $hesklang['s_inl']; ?></a>
                     </div>
-                    <div class="form-group">
-                        <label for="s_hesk_url" class="col-sm-3 control-label"><?php echo $hesklang['hesk_url']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#7','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_mlang" class="col-sm-3 control-label"><?php echo $hesklang['s_mlang']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#43','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['hesk_url']); ?>"
-                                   name="s_hesk_url" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['hesk_url']; ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <?php
+                        $on = $hesk_settings['can_sel_lang'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['can_sel_lang'] ? '' : 'checked="checked"';
+                        echo '
+                        <div class="radio"><label><input type="radio" name="s_can_sel_lang" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>
+                        <div class="radio"><label><input type="radio" name="s_can_sel_lang" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_admin_dir" class="col-sm-3 control-label"><?php echo $hesklang['adf']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#61','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['adf']); ?>" name="s_admin_dir"
-                                   size="40" maxlength="255" value="<?php echo $hesk_settings['admin_dir']; ?>"/>
-                        </div>
+                <h4 class="bold"><?php echo $hesklang['db']; ?></h4>
+
+                <div class="form-group">
+                    <label for="s_db_host" class="col-sm-3 control-label"><?php echo $hesklang['db_host']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#32','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['db_host']); ?>" type="text"
+                               name="s_db_host" id="m1" size="40" maxlength="255"
+                               value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_host']; ?>"
+                               autocomplete="off"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_attach_dir"
-                               class="col-sm-3 control-label"><?php echo $hesklang['ticket_attach_dir']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#62','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_db_name" class="col-sm-3 control-label"><?php echo $hesklang['db_name']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#33','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['ticket_attach_dir']); ?>"
-                                   name="s_attach_dir" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['attach_dir']; ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['db_name']); ?>" name="s_db_name"
+                               id="m2" size="40" maxlength="255"
+                               value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_name']; ?>"
+                               autocomplete="off"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_max_listings"
-                               class="col-sm-3 control-label"><?php echo $hesklang['max_listings']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#10','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_db_user" class="col-sm-3 control-label"><?php echo $hesklang['db_user']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#34','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['max_listings']); ?>"
-                                   name="s_max_listings" size="5" maxlength="30"
-                                   value="<?php echo $hesk_settings['max_listings']; ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['db_user']); ?>" name="s_db_user"
+                               id="m3" size="40" maxlength="255"
+                               value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_user']; ?>"
+                               autocomplete="off"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_print_font_size"
-                               class="col-sm-3 control-label"><?php echo $hesklang['print_size']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#11','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_db_pass" class="col-sm-3 control-label"><?php echo $hesklang['db_pass']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#35','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['print_size']); ?>"
-                                   name="s_print_font_size" size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['print_font_size']; ?>"/>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="password" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['db_pass']); ?>" name="s_db_pass"
+                               id="m4" size="40" maxlength="255"
+                               value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_pass']; ?>"
+                               autocomplete="off"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_autoclose" class="col-sm-3 control-label"><?php echo $hesklang['aclose']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#15','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_db_pfix" class="col-sm-3 control-label"><?php echo $hesklang['prefix']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>general.html#36','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['aclose']); ?>" name="s_autoclose"
-                                   size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['autoclose']; ?>"/><?php echo $hesklang['aclose2']; ?>
-                        </div>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['prefix']); ?>" name="s_db_pfix"
+                               id="m5" size="40" maxlength="255"
+                               value="<?php echo defined('HESK_DEMO') ? $hesklang['hdemo'] : $hesk_settings['db_pfix']; ?>"
+                               autocomplete="off"/>
                     </div>
-                    <div class="form-group">
-                        <label for="s_max_open" class="col-sm-3 control-label"><?php echo $hesklang['mop']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#58','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['mop']); ?>" name="s_max_open"
-                                   size="5" maxlength="3" value="<?php echo $hesk_settings['max_open']; ?>"/>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-9 col-sm-offset-3">
+                        <input type="button" class="btn btn-default move-down-4" onclick="hesk_testMySQL()"
+                               value="<?php echo $hesklang['mysqltest']; ?>"/>
+                        <!-- START MYSQL TEST -->
+                        <div id="mysql_test" style="display: none">
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="new_top" class="col-sm-3 control-label"><?php echo $hesklang['rord']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#59','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <?php
-                            $on = $hesk_settings['new_top'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['new_top'] ? '' : 'checked="checked"';
-                            echo '
+                        <script language="Javascript" type="text/javascript">
+                            function hesk_testMySQL() {
+                                var element = document.getElementById('mysql_test');
+                                element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
+                                element.style.display = 'block';
+
+                                var s_db_host = document.getElementById('m1').value;
+                                var s_db_name = document.getElementById('m2').value;
+                                var s_db_user = document.getElementById('m3').value;
+                                var s_db_pass = document.getElementById('m4').value;
+                                var s_db_pfix = document.getElementById('m5').value;
+
+                                var params = "test=mysql" +
+                                    "&s_db_host=" + encodeURIComponent(s_db_host) +
+                                    "&s_db_name=" + encodeURIComponent(s_db_name) +
+                                    "&s_db_user=" + encodeURIComponent(s_db_user) +
+                                    "&s_db_pass=" + encodeURIComponent(s_db_pass) +
+                                    "&s_db_pfix=" + encodeURIComponent(s_db_pfix);
+
+                                xmlHttp = GetXmlHttpObject();
+                                if (xmlHttp == null) {
+                                    return;
+                                }
+
+                                xmlHttp.open('POST', 'test_connection.php', true);
+                                xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+                                xmlHttp.setRequestHeader("Content-length", params.length);
+                                xmlHttp.setRequestHeader("Connection", "close");
+
+                                xmlHttp.onreadystatechange = function () {
+                                    if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                                        element.innerHTML = xmlHttp.responseText;
+                                    }
+                                }
+
+                                xmlHttp.send(params);
+                            }
+                        </script>
+                        <!-- END MYSQL TEST -->
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Helpdesk Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_2']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['hd']; ?></h4>
+                <div class="form-group">
+                    <label for="s_hesk_title" class="col-sm-3 control-label"><?php echo $hesklang['hesk_title']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#6','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['hesk_title']); ?>"
+                               name="s_hesk_title" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['hesk_title']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_hesk_url" class="col-sm-3 control-label"><?php echo $hesklang['hesk_url']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#7','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['hesk_url']); ?>"
+                               name="s_hesk_url" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['hesk_url']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_admin_dir" class="col-sm-3 control-label"><?php echo $hesklang['adf']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#61','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['adf']); ?>" name="s_admin_dir"
+                               size="40" maxlength="255" value="<?php echo $hesk_settings['admin_dir']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_attach_dir"
+                           class="col-sm-3 control-label"><?php echo $hesklang['ticket_attach_dir']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#62','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['ticket_attach_dir']); ?>"
+                               name="s_attach_dir" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['attach_dir']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_max_listings"
+                           class="col-sm-3 control-label"><?php echo $hesklang['max_listings']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#10','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['max_listings']); ?>"
+                               name="s_max_listings" size="5" maxlength="30"
+                               value="<?php echo $hesk_settings['max_listings']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_print_font_size"
+                           class="col-sm-3 control-label"><?php echo $hesklang['print_size']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#11','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['print_size']); ?>"
+                               name="s_print_font_size" size="5" maxlength="3"
+                               value="<?php echo $hesk_settings['print_font_size']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_autoclose" class="col-sm-3 control-label"><?php echo $hesklang['aclose']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#15','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['aclose']); ?>" name="s_autoclose"
+                               size="5" maxlength="3"
+                               value="<?php echo $hesk_settings['autoclose']; ?>"/><?php echo $hesklang['aclose2']; ?>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_max_open" class="col-sm-3 control-label"><?php echo $hesklang['mop']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#58','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['mop']); ?>" name="s_max_open"
+                               size="5" maxlength="3" value="<?php echo $hesk_settings['max_open']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="new_top" class="col-sm-3 control-label"><?php echo $hesklang['rord']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#59','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <?php
+                        $on = $hesk_settings['new_top'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['new_top'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_new_top" value="1" ' . $on . ' /> ' . $hesklang['newtop'] . '</label></div>
                         <div class="radio"><label><input type="radio" name="s_new_top" value="0" ' . $off . ' /> ' . $hesklang['newbot'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_reply_top" class="col-sm-3 control-label"><?php echo $hesklang['ford']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#60','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_reply_top" class="col-sm-3 control-label"><?php echo $hesklang['ford']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#60','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9">
-                            <?php
-                            $on = $hesk_settings['reply_top'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['reply_top'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-9">
+                        <?php
+                        $on = $hesk_settings['reply_top'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['reply_top'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_reply_top" value="1" ' . $on . ' /> ' . $hesklang['formtop'] . '</label></div>
                         <div class="radio"><label><input type="radio" name="s_reply_top" value="0" ' . $off . ' /> ' . $hesklang['formbot'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
+                </div>
 
-                    <h6 class="bold"><?php echo $hesklang['features']; ?></h6>
+                <h4 class="bold"><?php echo $hesklang['features']; ?></h4>
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="s_autologin" class="col-sm-6 control-label"><?php echo $hesklang['alo']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#44','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="footerWithBorder blankSpace"></div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label for="s_autologin" class="col-sm-6 control-label"><?php echo $hesklang['alo']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#44','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['autologin'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['autologin'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['autologin'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['autologin'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_autologin" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_autologin" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_custclose" class="col-sm-6 control-label"><?php echo $hesklang['ccct']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#67','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_custclose" class="col-sm-6 control-label"><?php echo $hesklang['ccct']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#67','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['custclose'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['custclose'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['custclose'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['custclose'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_custclose" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_custclose" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_custopen"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['s_ucrt']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#16','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_custopen"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['s_ucrt']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#16','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['custopen'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['custopen'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['custopen'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['custopen'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_custopen" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_custopen" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_cust_urgency"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['cpri']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#45','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_cust_urgency"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['cpri']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#45','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['cust_urgency'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['cust_urgency'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['cust_urgency'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['cust_urgency'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_cust_urgency" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_cust_urgency" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_time_worked" class="col-sm-6 control-label"><?php echo $hesklang['ts']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#66','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_time_worked" class="col-sm-6 control-label"><?php echo $hesklang['ts']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#66','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['time_worked'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['time_worked'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['time_worked'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['time_worked'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_time_worked" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_time_worked" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_spam_notice"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['spamn']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#68','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_spam_notice"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['spamn']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#68','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['spam_notice'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['spam_notice'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['spam_notice'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['spam_notice'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_spam_notice" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_spam_notice" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="s_list_users" class="col-sm-6 control-label"><?php echo $hesklang['lu']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#14','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_list_users" class="col-sm-6 control-label"><?php echo $hesklang['lu']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#14','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['list_users'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['list_users'] ? '' : 'checked="checked"';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['list_users'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['list_users'] ? '' : 'checked="checked"';
+                                echo '
                                 <div class="radio"><label><input type="radio" name="s_list_users" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                                 <div class="radio"><label><input type="radio" name="s_list_users" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="category_order_column" class="col-sm-6 control-label">
+                        </div>
+                        <div class="form-group">
+                            <label for="category_order_column" class="col-sm-6 control-label">
                                 <span class="label label-primary"
                                       data-toggle="tooltip"
                                       title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['category_sort']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['category_sort']; ?>"
-                                       data-content="<?php echo $hesklang['category_sort_help']; ?>"></i>
-                                </label>
+                                <?php echo $hesklang['category_sort']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['category_sort']; ?>"
+                                   data-content="<?php echo $hesklang['category_sort_help']; ?>"></i>
+                            </label>
 
-                                <div class="col-sm-6">
-                                    <?php
-                                    $on = $modsForHesk_settings['category_order_column'] == 'name' ? 'checked' : '';
-                                    $off = $modsForHesk_settings['category_order_column'] == 'name' ? '' : 'checked';
-                                    echo '
+                            <div class="col-sm-6">
+                                <?php
+                                $on = $modsForHesk_settings['category_order_column'] == 'name' ? 'checked' : '';
+                                $off = $modsForHesk_settings['category_order_column'] == 'name' ? '' : 'checked';
+                                echo '
 								<div class="radio"><label><input type="radio" name="category_order_column" value="0" ' . $off . '>' . $hesklang['sort_by_user_defined_order'] . '</label></div>
 								<div class="radio"><label><input type="radio" name="category_order_column" value="1" ' . $on . '>' . $hesklang['sort_alphabetically'] . '</label></div>
 								';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="rich_text_for_tickets" class="col-sm-6 control-label">
+                        </div>
+                        <div class="form-group">
+                            <label for="rich_text_for_tickets" class="col-sm-6 control-label">
                                 <span class="label label-primary"
                                       data-toggle="tooltip"
                                       title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['allow_rich_text_for_tickets']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['allow_rich_text_for_tickets']; ?>"
-                                       data-content="<?php echo $hesklang['allow_rich_text_for_tickets_help']; ?>"></i>
-                                </label>
+                                <?php echo $hesklang['allow_rich_text_for_tickets']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['allow_rich_text_for_tickets']; ?>"
+                                   data-content="<?php echo $hesklang['allow_rich_text_for_tickets_help']; ?>"></i>
+                            </label>
 
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $both = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
-                                    $staff = $modsForHesk_settings['rich_text_for_tickets'] && !$modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
-                                    $no = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? '' : 'checked';
-                                    echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $both = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
+                                $staff = $modsForHesk_settings['rich_text_for_tickets'] && !$modsForHesk_settings['rich_text_for_tickets_for_customers'] ? 'checked' : '';
+                                $no = $modsForHesk_settings['rich_text_for_tickets'] && $modsForHesk_settings['rich_text_for_tickets_for_customers'] ? '' : 'checked';
+                                echo '
 								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="0" ' . $no . '> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
 								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="1" ' . $staff . '> ' . $hesklang['staff_only'] . '</label></div>&nbsp;&nbsp;&nbsp;
 								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="2" ' . $both . '> ' . $hesklang['on'] . '</label></div>
 								';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="statuses_order_column" class="col-sm-6 control-label">
+                        </div>
+                        <div class="form-group">
+                            <label for="statuses_order_column" class="col-sm-6 control-label">
                                 <span class="label label-primary"
                                       data-toggle="tooltip"
                                       title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['status_sort']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['status_sort']; ?>"
-                                       data-content="<?php echo $hesklang['status_sort_help']; ?>"></i>
-                                </label>
+                                <?php echo $hesklang['status_sort']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['status_sort']; ?>"
+                                   data-content="<?php echo $hesklang['status_sort_help']; ?>"></i>
+                            </label>
 
-                                <div class="col-sm-6">
-                                    <?php
-                                    $on = $modsForHesk_settings['statuses_order_column'] == 'name' ? 'checked' : '';
-                                    $off = $modsForHesk_settings['statuses_order_column'] == 'name' ? '' : 'checked';
-                                    echo '
+                            <div class="col-sm-6">
+                                <?php
+                                $on = $modsForHesk_settings['statuses_order_column'] == 'name' ? 'checked' : '';
+                                $off = $modsForHesk_settings['statuses_order_column'] == 'name' ? '' : 'checked';
+                                echo '
 								<div class="radio"><label><input type="radio" name="statuses_order_column" value="0" ' . $off . '>' . $hesklang['sort_by_user_defined_order'] . '</label></div>
 								<div class="radio"><label><input type="radio" name="statuses_order_column" value="1" ' . $on . '>' . $hesklang['sort_alphabetically'] . '</label></div>
 								';
-                                    ?>
-                                </div>
+                                ?>
                             </div>
-                            <div class="form-group">
-                                <label for="display_user_agent_information" class="col-sm-6 control-label">
+                        </div>
+                        <div class="form-group">
+                            <label for="display_user_agent_information" class="col-sm-6 control-label">
                                 <span class="label label-primary"
                                       data-toggle="tooltip"
                                       title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['display_user_agent_information']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['display_user_agent_information']; ?>"
-                                       data-content="<?php echo $hesklang['display_user_agent_information_help']; ?>"></i>
-                                </label>
+                                <?php echo $hesklang['display_user_agent_information']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['display_user_agent_information']; ?>"
+                                   data-content="<?php echo $hesklang['display_user_agent_information_help']; ?>"></i>
+                            </label>
 
-                                <div class="col-sm-6">
-                                    <?php
-                                    $on = $modsForHesk_settings['display_user_agent_information'] ? 'checked' : '';
-                                    $off = $modsForHesk_settings['display_user_agent_information'] ? '' : 'checked';
-                                    echo '
+                            <div class="col-sm-6">
+                                <?php
+                                $on = $modsForHesk_settings['display_user_agent_information'] ? 'checked' : '';
+                                $off = $modsForHesk_settings['display_user_agent_information'] ? '' : 'checked';
+                                echo '
 								<div class="radio"><label><input type="radio" name="display_user_agent_information" value="0" ' . $off . '>' . $hesklang['no'] . '</label></div>
 								<div class="radio"><label><input type="radio" name="display_user_agent_information" value="1" ' . $on . '>' . $hesklang['yes'] . '</label></div>
 								';
-                                    ?>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- Second column -->
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label for="s_autoassign"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['saass']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#51','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['autoassign'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['autoassign'] ? '' : 'checked="checked"';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="s_autoassign" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_autoassign" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="s_rating" class="col-sm-6 control-label"><?php echo $hesklang['urate']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#17','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['rating'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['rating'] ? '' : 'checked="checked"';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="s_rating" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_rating" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="s_sequential"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['eseqid']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#49','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['sequential'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['sequential'] ? '' : 'checked="checked"';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="s_sequential" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_sequential" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="s_debug_mode"
-                                       class="col-sm-6 control-label"><?php echo $hesklang['debug_mode']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#12','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['debug_mode'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['debug_mode'] ? '' : 'checked="checked"';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="s_debug_mode" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_debug_mode" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="s_short_link" class="col-sm-6 control-label"><?php echo $hesklang['shu']; ?>
-                                    <a href="Javascript:void(0)"
-                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#63','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $hesk_settings['short_link'] ? 'checked="checked"' : '';
-                                    $off = $hesk_settings['short_link'] ? '' : 'checked="checked"';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="s_short_link" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_short_link" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="request_location" class="col-sm-6 control-label">
-                                <span class="label label-primary"
-                                      data-toggle="tooltip"
-                                      title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['request_user_location']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['request_user_location']; ?>"
-                                       data-content="<?php echo $hesklang['request_user_location_help']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-6 form-inline">
-                                    <?php
-                                    $on = $modsForHesk_settings['request_location'] ? 'checked' : '';
-                                    $off = $modsForHesk_settings['request_location'] ? '' : 'checked';
-                                    echo '
-                                <div class="radio"><label><input type="radio" name="request_location" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="request_location" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                                    ?>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-sm-6 control-label"><?php echo $hesklang['select']; ?> <a
-                                        href="Javascript:void(0)"
-                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#65','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                                <div class="col-sm-6">
-                                    <div class="checkbox">
-                                        <label><input type="checkbox" name="s_select_cat"
-                                                      value="1" <?php if ($hesk_settings['select_cat']) {
-                                                echo 'checked="checked"';
-                                            } ?>/> <?php echo $hesklang['category']; ?></label>
-                                    </div>
-                                    <div class="checkbox">
-                                        <label><input type="checkbox" name="s_select_pri"
-                                                      value="1" <?php if ($hesk_settings['select_pri']) {
-                                                echo 'checked="checked"';
-                                            } ?>/> <?php echo $hesklang['priority']; ?></label>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="quick_help_sections[]" class="col-sm-6 control-label">
-                                <span class="label label-primary"
-                                      data-toggle="tooltip"
-                                      title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                    <?php echo $hesklang['quick_help_sections']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                                       title="<?php echo $hesklang['quick_help_sections']; ?>"
-                                       data-content="<?php echo htmlspecialchars($hesklang['quick_help_sections_help']); ?>"></i>
-                                </label>
-
-                                <div class="col-sm-6">
-                                    <?php
-                                    $quickHelpRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "quick_help_sections`");
-                                    while ($row = hesk_dbFetchAssoc($quickHelpRs)): ?>
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="checkbox" name="quick_help_sections[]"
-                                                       value="<?php echo $row['id']; ?>" <?php if ($row['show']) {
-                                                    echo 'checked';
-                                                } ?>>
-                                                <?php echo $hesklang[$row['location']]; ?>
-                                            </label>
-                                        </div>
-                                        <?php
-                                    endwhile;
-                                    ?>
-                                </div>
+                                ?>
                             </div>
                         </div>
                     </div>
+                    <!-- Second column -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label for="s_autoassign"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['saass']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#51','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <h6 class="bold"><?php echo $hesklang['sp']; ?></h6>
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['autoassign'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['autoassign'] ? '' : 'checked="checked"';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="s_autoassign" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="s_autoassign" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_rating" class="col-sm-6 control-label"><?php echo $hesklang['urate']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#17','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="footerWithBorder blankSpace"></div>
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['rating'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['rating'] ? '' : 'checked="checked"';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="s_rating" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="s_rating" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_sequential"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['eseqid']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#49','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="form-group">
-                        <label for="s_secimg_use" class="col-sm-3 control-label"><?php echo $hesklang['use_secimg']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#13','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['sequential'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['sequential'] ? '' : 'checked="checked"';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="s_sequential" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="s_sequential" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_debug_mode"
+                                   class="col-sm-6 control-label"><?php echo $hesklang['debug_mode']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#12','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9 form-inline">
-                            <?php
-                            $onc = $hesk_settings['secimg_use'] == 1 ? 'checked="checked"' : '';
-                            $ons = $hesk_settings['secimg_use'] == 2 ? 'checked="checked"' : '';
-                            $off = $hesk_settings['secimg_use'] ? '' : 'checked="checked"';
-                            $div = $hesk_settings['secimg_use'] ? 'block' : 'none';
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['debug_mode'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['debug_mode'] ? '' : 'checked="checked"';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="s_debug_mode" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="s_debug_mode" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="s_short_link" class="col-sm-6 control-label"><?php echo $hesklang['shu']; ?>
+                                <a href="Javascript:void(0)"
+                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#63','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                            echo '
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $hesk_settings['short_link'] ? 'checked="checked"' : '';
+                                $off = $hesk_settings['short_link'] ? '' : 'checked="checked"';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="s_short_link" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="s_short_link" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="request_location" class="col-sm-6 control-label">
+                                <span class="label label-primary"
+                                      data-toggle="tooltip"
+                                      title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                                <?php echo $hesklang['request_user_location']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['request_user_location']; ?>"
+                                   data-content="<?php echo $hesklang['request_user_location_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $modsForHesk_settings['request_location'] ? 'checked' : '';
+                                $off = $modsForHesk_settings['request_location'] ? '' : 'checked';
+                                echo '
+                                <div class="radio"><label><input type="radio" name="request_location" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                                <div class="radio"><label><input type="radio" name="request_location" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                                ?>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-6 control-label"><?php echo $hesklang['select']; ?> <a
+                                    href="Javascript:void(0)"
+                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#65','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                            <div class="col-sm-6">
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="s_select_cat"
+                                                  value="1" <?php if ($hesk_settings['select_cat']) {
+                                            echo 'checked="checked"';
+                                        } ?>/> <?php echo $hesklang['category']; ?></label>
+                                </div>
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="s_select_pri"
+                                                  value="1" <?php if ($hesk_settings['select_pri']) {
+                                            echo 'checked="checked"';
+                                        } ?>/> <?php echo $hesklang['priority']; ?></label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="quick_help_sections[]" class="col-sm-6 control-label">
+                                <span class="label label-primary"
+                                      data-toggle="tooltip"
+                                      title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                                <?php echo $hesklang['quick_help_sections']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['quick_help_sections']; ?>"
+                                   data-content="<?php echo htmlspecialchars($hesklang['quick_help_sections_help']); ?>"></i>
+                            </label>
+
+                            <div class="col-sm-6">
+                                <?php
+                                $quickHelpRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "quick_help_sections`");
+                                while ($row = hesk_dbFetchAssoc($quickHelpRs)): ?>
+                                    <div class="checkbox">
+                                        <label>
+                                            <input type="checkbox" name="quick_help_sections[]"
+                                                   value="<?php echo $row['id']; ?>" <?php if ($row['show']) {
+                                                echo 'checked';
+                                            } ?>>
+                                            <?php echo $hesklang[$row['location']]; ?>
+                                        </label>
+                                    </div>
+                                    <?php
+                                endwhile;
+                                ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <h4 class="bold"><?php echo $hesklang['sp']; ?></h4>
+                <div class="form-group">
+                    <label for="s_secimg_use" class="col-sm-3 control-label"><?php echo $hesklang['use_secimg']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#13','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $onc = $hesk_settings['secimg_use'] == 1 ? 'checked="checked"' : '';
+                        $ons = $hesk_settings['secimg_use'] == 2 ? 'checked="checked"' : '';
+                        $off = $hesk_settings['secimg_use'] ? '' : 'checked="checked"';
+                        $div = $hesk_settings['secimg_use'] ? 'block' : 'none';
+
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_secimg_use" value="0" ' . $off . ' onclick="javascript:hesk_toggleLayer(\'captcha\',\'none\')" /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_secimg_use" value="1" ' . $onc . ' onclick="javascript:hesk_toggleLayer(\'captcha\',\'block\')" /> ' . $hesklang['onc'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_secimg_use" value="2" ' . $ons . ' onclick="javascript:hesk_toggleLayer(\'captcha\',\'block\')" /> ' . $hesklang['ons'] . '</label></div>
                         ';
 
-                            ?>
-                            <div id="captcha" style="display: <?php echo $div; ?>;">
+                        ?>
+                        <div id="captcha" style="display: <?php echo $div; ?>;">
 
-                                &nbsp;<br/>
+                            &nbsp;<br/>
 
-                                <b><?php echo $hesklang['sit']; ?>:</b><br/>
+                            <b><?php echo $hesklang['sit']; ?>:</b><br/>
 
-                                <?php
-
-                                $on = '';
-                                $on2 = '';
-                                $off = '';
-                                $div = 'block';
-
-                                if ($hesk_settings['recaptcha_use'] == 1) {
-                                    $on = 'checked="checked"';
-                                } elseif ($hesk_settings['recaptcha_use'] == 2) {
-                                    $on2 = 'checked="checked"';
-                                } else {
-                                    $off = 'checked="checked"';
-                                    $div = 'none';
-                                }
-                                ?>
-
-                                <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="0"
-                                                                 onclick="javascript:hesk_toggleLayer('recaptcha','none')" <?php echo $off; ?> /> <?php echo $hesklang['sis']; ?>
-                                    </label></div>
-                                <br/>
-
-                                <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="2"
-                                                                 onclick="javascript:hesk_toggleLayer('recaptcha','block')" <?php echo $on2; ?> /> <?php echo $hesklang['sir2']; ?>
-                                    </label> <a href="Javascript:void(0)"
-                                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></div>
-                                <br/>
-
-                                <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="1"
-                                                                 onclick="javascript:hesk_toggleLayer('recaptcha','block')" <?php echo $on; ?> /> <?php echo $hesklang['sir']; ?>
-                                    </label> <a href="Javascript:void(0)"
-                                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
-                                            class="fa fa-question-circle settingsquestionmark"></i></a></div>
-                                <br/>
-
-                                <div id="recaptcha" style="display: <?php echo $div; ?>;">
-
-                                    &nbsp;<br/>
-
-                                    <label for="s_recaptcha_public_key"
-                                           class="control-label"><?php echo $hesklang['rcpb']; ?> <a
-                                            href="Javascript:void(0)"
-                                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
-                                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                                    <input type="text" class="form-control"
-                                           placeholder="<?php echo htmlspecialchars($hesklang['rcpb']); ?>"
-                                           name="s_recaptcha_public_key" size="50" maxlength="255"
-                                           value="<?php echo $hesk_settings['recaptcha_public_key']; ?>"/><br/>
-                                    &nbsp;<br/>
-
-                                    <label for="s_recaptcha_private_key"
-                                           class="control-label"><?php echo $hesklang['rcpv']; ?> <a
-                                            href="Javascript:void(0)"
-                                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
-                                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                                    <input type="text" class="form-control"
-                                           placeholder="<?php echo htmlspecialchars($hesklang['rcpv']); ?>"
-                                           name="s_recaptcha_private_key" size="50" maxlength="255"
-                                           value="<?php echo $hesk_settings['recaptcha_private_key']; ?>"/><br/>
-                                    &nbsp;<br/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_question_use" class="col-sm-3 control-label"><?php echo $hesklang['use_q']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#42','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9 form-inline">
                             <?php
+
                             $on = '';
+                            $on2 = '';
                             $off = '';
                             $div = 'block';
 
-                            if ($hesk_settings['question_use']) {
+                            if ($hesk_settings['recaptcha_use'] == 1) {
                                 $on = 'checked="checked"';
+                            } elseif ($hesk_settings['recaptcha_use'] == 2) {
+                                $on2 = 'checked="checked"';
                             } else {
                                 $off = 'checked="checked"';
                                 $div = 'none';
                             }
-                            echo '
-                    <div class="radio"><label><input type="radio" name="s_question_use" value="0" ' . $off . ' onclick="javascript:hesk_toggleLayer(\'question\',\'none\')" /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                    <div class="radio"><label><input type="radio" name="s_question_use" value="1" ' . $on . ' onclick="javascript:hesk_toggleLayer(\'question\',\'block\')" /> ' . $hesklang['on'] . '</label></div>';
                             ?>
 
-                            <div id="question" style="display: <?php echo $div; ?>;">
-                                &nbsp;<br/>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_rate('generate_spam_question.php','question')"><?php echo $hesklang['genq']; ?></a><br/>
+                            <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="0"
+                                                             onclick="javascript:hesk_toggleLayer('recaptcha','none')" <?php echo $off; ?> /> <?php echo $hesklang['sis']; ?>
+                                </label></div>
+                            <br/>
 
-                                <label for="s_question_ask"
-                                       class="control-label"><?php echo $hesklang['q_q']; ?></label><br/>
+                            <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="2"
+                                                             onclick="javascript:hesk_toggleLayer('recaptcha','block')" <?php echo $on2; ?> /> <?php echo $hesklang['sir2']; ?>
+                                </label> <a href="Javascript:void(0)"
+                                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></div>
+                            <br/>
+
+                            <div class="radio"><label><input type="radio" name="s_recaptcha_use" value="1"
+                                                             onclick="javascript:hesk_toggleLayer('recaptcha','block')" <?php echo $on; ?> /> <?php echo $hesklang['sir']; ?>
+                                </label> <a href="Javascript:void(0)"
+                                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
+                                        class="fa fa-question-circle settingsquestionmark"></i></a></div>
+                            <br/>
+
+                            <div id="recaptcha" style="display: <?php echo $div; ?>;">
+
+                                &nbsp;<br/>
+
+                                <label for="s_recaptcha_public_key"
+                                       class="control-label"><?php echo $hesklang['rcpb']; ?> <a
+                                        href="Javascript:void(0)"
+                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
+                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                <input type="text" class="form-control"
+                                       placeholder="<?php echo htmlspecialchars($hesklang['rcpb']); ?>"
+                                       name="s_recaptcha_public_key" size="50" maxlength="255"
+                                       value="<?php echo $hesk_settings['recaptcha_public_key']; ?>"/><br/>
+                                &nbsp;<br/>
+
+                                <label for="s_recaptcha_private_key"
+                                       class="control-label"><?php echo $hesklang['rcpv']; ?> <a
+                                        href="Javascript:void(0)"
+                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#64','400','500')"><i
+                                            class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                <input type="text" class="form-control"
+                                       placeholder="<?php echo htmlspecialchars($hesklang['rcpv']); ?>"
+                                       name="s_recaptcha_private_key" size="50" maxlength="255"
+                                       value="<?php echo $hesk_settings['recaptcha_private_key']; ?>"/><br/>
+                                &nbsp;<br/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_question_use" class="col-sm-3 control-label"><?php echo $hesklang['use_q']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#42','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $on = '';
+                        $off = '';
+                        $div = 'block';
+
+                        if ($hesk_settings['question_use']) {
+                            $on = 'checked="checked"';
+                        } else {
+                            $off = 'checked="checked"';
+                            $div = 'none';
+                        }
+                        echo '
+                    <div class="radio"><label><input type="radio" name="s_question_use" value="0" ' . $off . ' onclick="javascript:hesk_toggleLayer(\'question\',\'none\')" /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                    <div class="radio"><label><input type="radio" name="s_question_use" value="1" ' . $on . ' onclick="javascript:hesk_toggleLayer(\'question\',\'block\')" /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
+
+                        <div id="question" style="display: <?php echo $div; ?>;">
+                            &nbsp;<br/>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_rate('generate_spam_question.php','question')"><?php echo $hesklang['genq']; ?></a><br/>
+
+                            <label for="s_question_ask"
+                                   class="control-label"><?php echo $hesklang['q_q']; ?></label><br/>
                                 <textarea name="s_question_ask" class="form-control" rows="3"
                                           cols="40"><?php echo hesk_htmlentities($hesk_settings['question_ask']); ?></textarea><br/>
-                                &nbsp;<br/>
+                            &nbsp;<br/>
 
-                                <label for="s_question_ans"
-                                       class="control-label"><?php echo $hesklang['q_a']; ?></label><br/>
-                                <input type="text" class="form-control" name="s_question_ans"
-                                       value="<?php echo $hesk_settings['question_ans']; ?>" size="10"/><br/>
-                                &nbsp;<br/>
+                            <label for="s_question_ans"
+                                   class="control-label"><?php echo $hesklang['q_a']; ?></label><br/>
+                            <input type="text" class="form-control" name="s_question_ans"
+                                   value="<?php echo $hesk_settings['question_ans']; ?>" size="10"/><br/>
+                            &nbsp;<br/>
 
-                            </div>
                         </div>
                     </div>
-                    <br/>
-                    <h6 class="bold"><?php echo $hesklang['security']; ?></h6>
+                </div>
+                <h4 class="bold"><?php echo $hesklang['security']; ?></h4>
+                <div class="form-group">
+                    <label for="s_attempt_limit" class="col-sm-4 control-label"><?php echo $hesklang['banlim']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#47','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="footerWithBorder blankSpace"></div>
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['banlim']); ?>"
+                               name="s_attempt_limit" size="5" maxlength="30"
+                               value="<?php echo($hesk_settings['attempt_limit'] ? ($hesk_settings['attempt_limit'] - 1) : 0); ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_attempt_banmin" class="col-sm-4 control-label"><?php echo $hesklang['banmin']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#47','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="form-group">
-                        <label for="s_attempt_limit" class="col-sm-4 control-label"><?php echo $hesklang['banlim']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#47','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['banmin']); ?>"
+                               name="s_attempt_banmin" size="5" maxlength="3"
+                               value="<?php echo $hesk_settings['attempt_banmin']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_reset_pass" class="col-sm-4 control-label"><?php echo $hesklang['passr']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#69','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['banlim']); ?>"
-                                   name="s_attempt_limit" size="5" maxlength="30"
-                                   value="<?php echo($hesk_settings['attempt_limit'] ? ($hesk_settings['attempt_limit'] - 1) : 0); ?>"/>
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_reset_pass"
+                                          value="1" <?php if ($hesk_settings['reset_pass']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['passa']; ?></label>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label for="s_attempt_banmin" class="col-sm-4 control-label"><?php echo $hesklang['banmin']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#47','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_email_view_ticket"
+                           class="col-sm-4 control-label"><?php echo $hesklang['viewvtic']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#46','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['banmin']); ?>"
-                                   name="s_attempt_banmin" size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['attempt_banmin']; ?>"/>
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_email_view_ticket"
+                                          value="1" <?php if ($hesk_settings['email_view_ticket']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['reqetv']; ?></label>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label for="s_reset_pass" class="col-sm-4 control-label"><?php echo $hesklang['passr']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#69','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_reset_pass"
-                                              value="1" <?php if ($hesk_settings['reset_pass']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['passa']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_email_view_ticket"
-                               class="col-sm-4 control-label"><?php echo $hesklang['viewvtic']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#46','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_email_view_ticket"
-                                              value="1" <?php if ($hesk_settings['email_view_ticket']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['reqetv']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="email-verification" class="col-sm-4 col-xs-12 control-label">
+                </div>
+                <div class="form-group">
+                    <label for="email-verification" class="col-sm-4 col-xs-12 control-label">
                     <span class="label label-primary"
                           data-toggle="tooltip"
                           title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['customer_email_verification']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['customer_email_verification']; ?>"
-                               data-content="<?php echo $hesklang['customer_email_verification_help']; ?>"></i>
-                        </label>
+                        <?php echo $hesklang['customer_email_verification']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['customer_email_verification']; ?>"
+                           data-content="<?php echo $hesklang['customer_email_verification_help']; ?>"></i>
+                    </label>
 
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="email-verification" name="email-verification"
-                                           type="checkbox" <?php if ($modsForHesk_settings['customer_email_verification_required']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['require_customer_validate_email']; ?>
-                                </label>
-                            </div>
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="email-verification" name="email-verification"
+                                       type="checkbox" <?php if ($modsForHesk_settings['customer_email_verification_required']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['require_customer_validate_email']; ?>
+                            </label>
                         </div>
                     </div>
-                    <br/>
-                    <h6 class="bold"><?php echo $hesklang['attachments']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_attach_use" class="col-sm-3 control-label"><?php echo $hesklang['attach_use'];
-                            $onload_status = ''; ?> <a href="Javascript:void(0)"
-                                                       onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#37','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9 form-inline">
-                            <?php
-                            if ($enable_use_attachments) {
-                                ?>
-                                <div class="radio"><label><input type="radio" name="s_attach_use" value="0"
-                                                                 onclick="hesk_attach_disable(new Array('a1','a2','a3','a4'))" <?php if (!$hesk_settings['attachments']['use']) {
-                                            echo ' checked="checked" ';
-                                            $onload_status = ' disabled="disabled" ';
-                                        } ?> />
-                                        <?php echo $hesklang['no']; ?></label></div>&nbsp;&nbsp;&nbsp;
-                                <div class="radio"><label><input type="radio" name="s_attach_use" value="1"
-                                                                 onclick="hesk_attach_enable(new Array('a1','a2','a3','a4'))" <?php if ($hesk_settings['attachments']['use']) {
-                                            echo ' checked="checked" ';
-                                        } ?> />
-                                    <?php echo $hesklang['yes'] . '</label>'; ?></div>
-
-                                <?php
-                                if (!defined('HESK_DEMO')) {
-                                    ?>
-
-                                    &nbsp; (<a href="javascript:void(0);"
-                                               onclick="hesk_toggleLayerDisplay('attachments_limits');"><?php echo $hesklang['vscl']; ?></a>)
-
-                                    <div id="attachments_limits" style="display:none">
-                                        upload_max_filesize: <?php echo @ini_get('upload_max_filesize'); ?><br/>
-                                        <?php
-                                        if (version_compare(phpversion(), '5.2.12', '>=')) {
-                                            echo 'max_file_uploads: ' . @ini_get('max_file_uploads') . '<br />';
-                                        }
-                                        ?>
-                                        post_max_size: <?php echo @ini_get('post_max_size'); ?><br/>
-                                    </div>
-                                    <?php
-                                }
-                            } else {
-                                $onload_status = ' disabled="disabled" ';
-                                echo '<input type="hidden" name="s_attach_use" value="0" /><font class="notice">' . $hesklang['e_attach'] . '</font>';
-                            }
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_max_num" class="col-sm-3 control-label"><?php echo $hesklang['attach_num']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#38','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['attach_num']); ?>"
-                                   name="s_max_number" size="5" maxlength="2" id="a1"
-                                   value="<?php echo $hesk_settings['attachments']['max_number']; ?>" <?php echo $onload_status; ?> />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <?php
-                        $suffixes = array(
-                            'B' => $hesklang['B'] . ' (' . $hesklang['bytes'] . ')',
-                            'kB' => $hesklang['kB'] . ' (' . $hesklang['kilobytes'] . ')',
-                            'MB' => $hesklang['MB'] . ' (' . $hesklang['megabytes'] . ')',
-                            'GB' => $hesklang['GB'] . ' (' . $hesklang['gigabytes'] . ')',
-                        );
-                        $tmp = hesk_formatBytes($hesk_settings['attachments']['max_size'], 0);
-                        list($size, $unit) = explode(' ', $tmp);
-                        ?>
-                        <label for="s_max_size" class="col-sm-3 control-label"><?php echo $hesklang['attach_size']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#39','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['attach_size']); ?>"
-                                   name="s_max_size" size="5" maxlength="6" id="a2"
-                                   value="<?php echo $size; ?>" <?php echo $onload_status; ?> />
-                        </div>
-                        <div class="col-sm-6">
-                            <select name="s_max_unit" class="form-control" id="a4" <?php echo $onload_status; ?> >
-                                <?php
-                                foreach ($suffixes as $k => $v) {
-                                    if ($k == $unit) {
-                                        echo '<option value="' . $k . '" selected="selected">' . $v . '</option>';
-                                    } else {
-                                        echo '<option value="' . $k . '">' . $v . '</option>';
-                                    }
-                                }
-                                ?>
-							</select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_allowed_types"
-                               class="col-sm-3 control-label"><?php echo $hesklang['attach_type']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#40','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['attach_type']); ?>"
-                                   name="s_allowed_types" size="40" maxlength="255" id="a3"
-                                   value="<?php echo implode(',', $hesk_settings['attachments']['allowed_types']); ?>" <?php echo $onload_status; ?> />
-                        </div>
-                    </div>
-
                 </div>
 
-                <div class="tab-pane fade in" id="knowledgebase">
-                    <h6 class="bold"><?php echo $hesklang['kb_set']; ?></h6>
+                <h4 class="bold"><?php echo $hesklang['attachments']; ?></h4>
+                <div class="form-group">
+                    <label for="s_attach_use" class="col-sm-3 control-label"><?php echo $hesklang['attach_use'];
+                        $onload_status = ''; ?> <a href="Javascript:void(0)"
+                                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#37','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                    <div class="footerWithBorder blankSpace"></div>
-                    <div class="form-group">
-                        <label for="s_kb_enable" class="col-sm-4 control-label"><?php echo $hesklang['s_ekb']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#22','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        if ($enable_use_attachments) {
+                            ?>
+                            <div class="radio"><label><input type="radio" name="s_attach_use" value="0"
+                                                             onclick="hesk_attach_disable(new Array('a1','a2','a3','a4'))" <?php if (!$hesk_settings['attachments']['use']) {
+                                        echo ' checked="checked" ';
+                                        $onload_status = ' disabled="disabled" ';
+                                    } ?> />
+                                    <?php echo $hesklang['no']; ?></label></div>&nbsp;&nbsp;&nbsp;
+                            <div class="radio"><label><input type="radio" name="s_attach_use" value="1"
+                                                             onclick="hesk_attach_enable(new Array('a1','a2','a3','a4'))" <?php if ($hesk_settings['attachments']['use']) {
+                                        echo ' checked="checked" ';
+                                    } ?> />
+                                <?php echo $hesklang['yes'] . '</label>'; ?></div>
 
-                        <div class="col-sm-8 form-inline">
                             <?php
-                            $on = $hesk_settings['kb_enable'] == 1 ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_enable'] ? '' : 'checked="checked"';
-                            $only = $hesk_settings['kb_enable'] == 2 ? 'checked="checked"' : '';
-                            echo '
+                            if (!defined('HESK_DEMO')) {
+                                ?>
+
+                                &nbsp; (<a href="javascript:void(0);"
+                                           onclick="hesk_toggleLayerDisplay('attachments_limits');"><?php echo $hesklang['vscl']; ?></a>)
+
+                                <div id="attachments_limits" style="display:none">
+                                    upload_max_filesize: <?php echo @ini_get('upload_max_filesize'); ?><br/>
+                                    <?php
+                                    if (version_compare(phpversion(), '5.2.12', '>=')) {
+                                        echo 'max_file_uploads: ' . @ini_get('max_file_uploads') . '<br />';
+                                    }
+                                    ?>
+                                    post_max_size: <?php echo @ini_get('post_max_size'); ?><br/>
+                                </div>
+                                <?php
+                            }
+                        } else {
+                            $onload_status = ' disabled="disabled" ';
+                            echo '<input type="hidden" name="s_attach_use" value="0" /><font class="notice">' . $hesklang['e_attach'] . '</font>';
+                        }
+                        ?>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_max_num" class="col-sm-3 control-label"><?php echo $hesklang['attach_num']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#38','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['attach_num']); ?>"
+                               name="s_max_number" size="5" maxlength="2" id="a1"
+                               value="<?php echo $hesk_settings['attachments']['max_number']; ?>" <?php echo $onload_status; ?> />
+                    </div>
+                </div>
+                <div class="form-group">
+                    <?php
+                    $suffixes = array(
+                        'B' => $hesklang['B'] . ' (' . $hesklang['bytes'] . ')',
+                        'kB' => $hesklang['kB'] . ' (' . $hesklang['kilobytes'] . ')',
+                        'MB' => $hesklang['MB'] . ' (' . $hesklang['megabytes'] . ')',
+                        'GB' => $hesklang['GB'] . ' (' . $hesklang['gigabytes'] . ')',
+                    );
+                    $tmp = hesk_formatBytes($hesk_settings['attachments']['max_size'], 0);
+                    list($size, $unit) = explode(' ', $tmp);
+                    ?>
+                    <label for="s_max_size" class="col-sm-3 control-label"><?php echo $hesklang['attach_size']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#39','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['attach_size']); ?>"
+                               name="s_max_size" size="5" maxlength="6" id="a2"
+                               value="<?php echo $size; ?>" <?php echo $onload_status; ?> />
+                    </div>
+                    <div class="col-sm-6">
+                        <select name="s_max_unit" class="form-control" id="a4" <?php echo $onload_status; ?> >
+                            <?php
+                            foreach ($suffixes as $k => $v) {
+                                if ($k == $unit) {
+                                    echo '<option value="' . $k . '" selected="selected">' . $v . '</option>';
+                                } else {
+                                    echo '<option value="' . $k . '">' . $v . '</option>';
+                                }
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_allowed_types"
+                           class="col-sm-3 control-label"><?php echo $hesklang['attach_type']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>helpdesk.html#40','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['attach_type']); ?>"
+                               name="s_allowed_types" size="40" maxlength="255" id="a3"
+                               value="<?php echo implode(',', $hesk_settings['attachments']['allowed_types']); ?>" <?php echo $onload_status; ?> />
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Knowledgebase Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_3']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <div class="form-group">
+                    <label for="s_kb_enable" class="col-sm-4 control-label"><?php echo $hesklang['s_ekb']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#22','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_enable'] == 1 ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_enable'] ? '' : 'checked="checked"';
+                        $only = $hesk_settings['kb_enable'] == 2 ? 'checked="checked"' : '';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_enable" value="1" ' . $on . ' /> ' . $hesklang['ekb_y'] . '</label></div><br>
                         <div class="radio"><label><input type="radio" name="s_kb_enable" value="2" ' . $only . ' /> ' . $hesklang['ekb_o'] . '</label></div><br>
                         <div class="radio"><label><input type="radio" name="s_kb_enable" value="0" ' . $off . ' /> ' . $hesklang['ekb_n'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
+                </div>
 
-                    <div class="form-group">
-                        <label for="kb_attach_dir" class="col-sm-4 control-label">
+                <div class="form-group">
+                    <label for="kb_attach_dir" class="col-sm-4 control-label">
                           <span class="label label-primary"
                                 data-toggle="tooltip"
                                 title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['kb_attach_dir']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['kb_attach_dir']; ?>"
-                               data-content="<?php echo $hesklang['kb_attach_dir_help']; ?>"></i>
-                        </label>
+                        <?php echo $hesklang['kb_attach_dir']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['kb_attach_dir']; ?>"
+                           data-content="<?php echo $hesklang['kb_attach_dir_help']; ?>"></i>
+                    </label>
 
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['kb_attach_dir']); ?>"
-                                   name="kb_attach_dir" size="40" maxlength="255"
-                                   value="<?php echo $modsForHesk_settings['kb_attach_dir']; ?>">
-                        </div>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['kb_attach_dir']); ?>"
+                               name="kb_attach_dir" size="40" maxlength="255"
+                               value="<?php echo $modsForHesk_settings['kb_attach_dir']; ?>">
                     </div>
-                    <div class="form-group">
-                        <label for="knowledgebase-visibility-setting" class="col-sm-4 col-xs-12 control-label">
+                </div>
+                <div class="form-group">
+                    <label for="knowledgebase-visibility-setting" class="col-sm-4 col-xs-12 control-label">
                           <span class="label label-primary"
                                 data-toggle="tooltip"
                                 title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['new_article_default_type']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['new_article_default_type']; ?>"
-                               data-content="<?php echo $hesklang['new_article_default_type_help']; ?>"></i>
-                        </label>
+                        <?php echo $hesklang['new_article_default_type']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['new_article_default_type']; ?>"
+                           data-content="<?php echo $hesklang['new_article_default_type_help']; ?>"></i>
+                    </label>
 
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="new_kb_article_visibility"
-                                           value="0" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 0 ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['kb_published']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       title="<?php echo $hesklang['kb_published']; ?>"
-                                       data-content="<?php echo $hesklang['kb_published2']; ?>"></i>
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="new_kb_article_visibility"
-                                           value="1" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 1 ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['kb_private']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       title="<?php echo $hesklang['kb_private']; ?>"
-                                       data-content="<?php echo $hesklang['kb_private2']; ?>"></i>
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="new_kb_article_visibility"
-                                           value="2" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 2 ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['kb_draft']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       title="<?php echo $hesklang['kb_draft']; ?>"
-                                       data-content="<?php echo $hesklang['kb_draft3']; ?>"></i>
-                                </label>
-                            </div>
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="new_kb_article_visibility"
+                                       value="0" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 0 ? 'checked' : ''; ?>>
+                                <?php echo $hesklang['kb_published']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   title="<?php echo $hesklang['kb_published']; ?>"
+                                   data-content="<?php echo $hesklang['kb_published2']; ?>"></i>
+                            </label>
+                        </div>
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="new_kb_article_visibility"
+                                       value="1" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 1 ? 'checked' : ''; ?>>
+                                <?php echo $hesklang['kb_private']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   title="<?php echo $hesklang['kb_private']; ?>"
+                                   data-content="<?php echo $hesklang['kb_private2']; ?>"></i>
+                            </label>
+                        </div>
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="new_kb_article_visibility"
+                                       value="2" <?php echo $modsForHesk_settings['new_kb_article_visibility'] == 2 ? 'checked' : ''; ?>>
+                                <?php echo $hesklang['kb_draft']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   title="<?php echo $hesklang['kb_draft']; ?>"
+                                   data-content="<?php echo $hesklang['kb_draft3']; ?>"></i>
+                            </label>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_wysiwyg" class="col-sm-4 control-label"><?php echo $hesklang['swyse']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#52','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_wysiwyg" class="col-sm-4 control-label"><?php echo $hesklang['swyse']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#52','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['kb_wysiwyg'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_wysiwyg'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_wysiwyg'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_wysiwyg'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_wysiwyg" value="0" ' . $off . ' /> ' . $hesklang['no'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_wysiwyg" value="1" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_recommend_answers"
-                               class="col-sm-4 control-label"><?php echo $hesklang['s_suggest']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#23','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_recommend_answers"
+                           class="col-sm-4 control-label"><?php echo $hesklang['s_suggest']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#23','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['kb_recommendanswers'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_recommendanswers'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_recommendanswers'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_recommendanswers'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_recommendanswers" value="0" ' . $off . ' /> ' . $hesklang['no'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_recommendanswers" value="1" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_rating" class="col-sm-4 control-label"><?php echo $hesklang['s_kbr']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#24','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_rating" class="col-sm-4 control-label"><?php echo $hesklang['s_kbr']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#24','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['kb_rating'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_rating'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_rating'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_rating'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_rating" value="0" ' . $off . ' /> ' . $hesklang['no'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_rating" value="1" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_views" class="col-sm-4 control-label"><?php echo $hesklang['sav']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#58','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_views" class="col-sm-4 control-label"><?php echo $hesklang['sav']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#58','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['kb_views'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_views'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_views'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_views'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_views" value="0" ' . $off . ' /> ' . $hesklang['no'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_views" value="1" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_date" class="col-sm-4 control-label"><?php echo $hesklang['sad']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#59','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_date" class="col-sm-4 control-label"><?php echo $hesklang['sad']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#59','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['kb_date'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['kb_date'] ? '' : 'checked="checked"';
-                            echo '
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['kb_date'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['kb_date'] ? '' : 'checked="checked"';
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_date" value="0" ' . $off . ' /> ' . $hesklang['no'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_date" value="1" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div>';
-                            ?>
-                        </div>
+                        ?>
                     </div>
-                    <div class="form-group">
-                        <label for="s_kb_search" class="col-sm-4 control-label"><?php echo $hesklang['s_kbs']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#25','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_search" class="col-sm-4 control-label"><?php echo $hesklang['s_kbs']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#25','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $off = $hesk_settings['kb_search'] ? '' : 'checked="checked"';
-                            $small = $hesk_settings['kb_search'] == 1 ? 'checked="checked"' : '';
-                            $large = $hesk_settings['kb_search'] == 2 ? 'checked="checked"' : '';
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $off = $hesk_settings['kb_search'] ? '' : 'checked="checked"';
+                        $small = $hesk_settings['kb_search'] == 1 ? 'checked="checked"' : '';
+                        $large = $hesk_settings['kb_search'] == 2 ? 'checked="checked"' : '';
 
-                            echo '
+                        echo '
                         <div class="radio"><label><input type="radio" name="s_kb_search" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_search" value="1" ' . $small . ' /> ' . $hesklang['small'] . '</label></div>&nbsp;&nbsp;&nbsp;
                         <div class="radio"><label><input type="radio" name="s_kb_search" value="2" ' . $large . ' /> ' . $hesklang['large'] . '</label></div>
                         ';
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_search_limit"
-                               class="col-sm-4 control-label"><?php echo $hesklang['s_maxsr']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#26','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_maxsr']); ?>"
-                                   name="s_kb_search_limit" size="5" maxlength="3"
-                                   value="<?php echo $hesk_settings['kb_search_limit']; ?>"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_substrart" class="col-sm-4 control-label"><?php echo $hesklang['s_ptxt']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#27','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_ptxt']); ?>"
-                                   name="s_kb_substrart" size="5" maxlength="5"
-                                   value="<?php echo $hesk_settings['kb_substrart']; ?>"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_cols" class="col-sm-4 control-label"><?php echo $hesklang['s_scol']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#28','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_scol']); ?>" name="s_kb_cols"
-                                   size="5" maxlength="2" value="<?php echo $hesk_settings['kb_cols']; ?>"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_numshow" class="col-sm-4 control-label"><?php echo $hesklang['s_psubart']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#29','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_psubart']); ?>"
-                                   name="s_kb_numshow" size="5" maxlength="2"
-                                   value="<?php echo $hesk_settings['kb_numshow']; ?>"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_index_popart" class="col-sm-4 control-label"><?php echo $hesklang['s_spop']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#30','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>"
-                                   name="s_kb_index_popart" size="5" maxlength="2"
-                                   value="<?php echo $hesk_settings['kb_index_popart']; ?>"/>
-                        </div>
-                        <div class="col-sm-5 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-3 col-sm-offset-4">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>" name="s_kb_popart"
-                                   size="5" maxlength="2" value="<?php echo $hesk_settings['kb_popart']; ?>"/>
-                        </div>
-                        <div class="col-sm-5 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_latest" class="col-sm-4 control-label"><?php echo $hesklang['s_slat']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#31','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>"
-                                   name="s_kb_index_latest" size="5" maxlength="2"
-                                   value="<?php echo $hesk_settings['kb_index_latest']; ?>"/>
-                        </div>
-                        <div class="col-sm-5 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-3 col-sm-offset-4">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>" name="s_kb_latest"
-                                   size="5" maxlength="2" value="<?php echo $hesk_settings['kb_latest']; ?>"/>
-                        </div>
-                        <div class="col-sm-5 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_kb_related" class="col-sm-4 control-label"><?php echo $hesklang['s_relart']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#60','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['s_relart']); ?>"
-                                   name="s_kb_related" size="5" maxlength="2"
-                                   value="<?php echo $hesk_settings['kb_related']; ?>"/>
-                        </div>
-                        <div class="col-sm-5 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
-                        </div>
+                        ?>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="s_kb_search_limit"
+                           class="col-sm-4 control-label"><?php echo $hesklang['s_maxsr']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#26','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                <!-- Calendar Tab -->
-                <div class="tab-pane fade in" id="calendar">
-                    <h6 class="bold"><?php echo $hesklang['calendar_settings']; ?></h6>
-                    <div class="footerWithBorder blankSpace"></div>
-                    <div class="form-group">
-                        <label for="enable_calendar" class="col-sm-4 col-xs-12 control-label">
-                            <?php echo $hesklang['enable_calendar']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['enable_calendar']; ?>"
-                               data-content="<?php echo $hesklang['enable_calendar_help']; ?>"></i>
-                        </label>
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $modsForHesk_settings['enable_calendar'] == 1 ? 'checked="checked"' : '';
-                            $off = $modsForHesk_settings['enable_calendar'] ? '' : 'checked="checked"';
-                            $only = $modsForHesk_settings['enable_calendar'] == 2 ? 'checked="checked"' : '';
-                            echo '
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_maxsr']); ?>"
+                               name="s_kb_search_limit" size="5" maxlength="3"
+                               value="<?php echo $hesk_settings['kb_search_limit']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_substrart" class="col-sm-4 control-label"><?php echo $hesklang['s_ptxt']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#27','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_ptxt']); ?>"
+                               name="s_kb_substrart" size="5" maxlength="5"
+                               value="<?php echo $hesk_settings['kb_substrart']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_cols" class="col-sm-4 control-label"><?php echo $hesklang['s_scol']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#28','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_scol']); ?>" name="s_kb_cols"
+                               size="5" maxlength="2" value="<?php echo $hesk_settings['kb_cols']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_numshow" class="col-sm-4 control-label"><?php echo $hesklang['s_psubart']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#29','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_psubart']); ?>"
+                               name="s_kb_numshow" size="5" maxlength="2"
+                               value="<?php echo $hesk_settings['kb_numshow']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_index_popart" class="col-sm-4 control-label"><?php echo $hesklang['s_spop']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#30','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>"
+                               name="s_kb_index_popart" size="5" maxlength="2"
+                               value="<?php echo $hesk_settings['kb_index_popart']; ?>"/>
+                    </div>
+                    <div class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-3 col-sm-offset-4">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_spop']); ?>" name="s_kb_popart"
+                               size="5" maxlength="2" value="<?php echo $hesk_settings['kb_popart']; ?>"/>
+                    </div>
+                    <div class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_latest" class="col-sm-4 control-label"><?php echo $hesklang['s_slat']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#31','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>"
+                               name="s_kb_index_latest" size="5" maxlength="2"
+                               value="<?php echo $hesk_settings['kb_index_latest']; ?>"/>
+                    </div>
+                    <div class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-3 col-sm-offset-4">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_slat']); ?>" name="s_kb_latest"
+                               size="5" maxlength="2" value="<?php echo $hesk_settings['kb_latest']; ?>"/>
+                    </div>
+                    <div class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onkb']; ?></p>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_kb_related" class="col-sm-4 control-label"><?php echo $hesklang['s_relart']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>knowledgebase.html#60','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['s_relart']); ?>"
+                               name="s_kb_related" size="5" maxlength="2"
+                               value="<?php echo $hesk_settings['kb_related']; ?>"/>
+                    </div>
+                    <div class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Calendar Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['calendar_title_case']; ?>
+                    <span class="label label-primary" data-toggle="tooltip"
+                          title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>">
+                        <?php echo $hesklang['mods_for_hesk_acronym']; ?>
+                    </span>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['calendar_settings']; ?></h4>
+                <div class="form-group">
+                    <label for="enable_calendar" class="col-sm-4 col-xs-12 control-label">
+                        <?php echo $hesklang['enable_calendar']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['enable_calendar']; ?>"
+                           data-content="<?php echo $hesklang['enable_calendar_help']; ?>"></i>
+                    </label>
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $modsForHesk_settings['enable_calendar'] == 1 ? 'checked="checked"' : '';
+                        $off = $modsForHesk_settings['enable_calendar'] ? '' : 'checked="checked"';
+                        $only = $modsForHesk_settings['enable_calendar'] == 2 ? 'checked="checked"' : '';
+                        echo '
                         <div class="radio"><label><input type="radio" name="enable_calendar" value="1" ' . $on . ' /> ' . $hesklang['yes_enable_calendar'] . '</label></div><br>
                         <div class="radio"><label><input type="radio" name="enable_calendar" value="2" ' . $only . ' /> ' . $hesklang['yes_enable_calendar_staff_only'] . '</label></div><br>
                         <div class="radio"><label><input type="radio" name="enable_calendar" value="0" ' . $off . ' /> ' . $hesklang['no_disable_calendar'] . '</label></div>';
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="first-day-of-week" class="col-sm-4 col-xs-12 control-label">
-                            <?php echo $hesklang['first_day_of_week']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['first_day_of_week']; ?>"
-                               data-content="<?php echo $hesklang['first_day_of_week_help']; ?>"></i>
-                        </label>
-                        <div class="col-sm-8 col-xs-12">
-                            <select name="first-day-of-week" class="form-control">
-                                <option value="0" <?php if ($modsForHesk_settings['first_day_of_week'] == '0') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d0']; ?>
-                                </option>
-                                <option value="1" <?php if ($modsForHesk_settings['first_day_of_week'] == '1') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d1']; ?>
-                                </option>
-                                <option value="2" <?php if ($modsForHesk_settings['first_day_of_week'] == '2') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d2']; ?>
-                                </option>
-                                <option value="3" <?php if ($modsForHesk_settings['first_day_of_week'] == '3') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d3']; ?>
-                                </option>
-                                <option value="4" <?php if ($modsForHesk_settings['first_day_of_week'] == '4') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d4']; ?>
-                                </option>
-                                <option value="5" <?php if ($modsForHesk_settings['first_day_of_week'] == '5') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d5']; ?>
-                                </option>
-                                <option value="6" <?php if ($modsForHesk_settings['first_day_of_week'] == '6') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['d6']; ?>
-                                </option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="default-view" class="col-sm-4 col-xs-12 control-label">
-                            <?php echo $hesklang['default_view']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['default_view']; ?>"
-                               data-content="<?php echo $hesklang['default_view_help']; ?>"></i>
-                        </label>
-                        <div class="col-sm-8 col-xs-12">
-                            <select name="default-view" class="form-control">
-                                <option value="month" <?php if ($modsForHesk_settings['default_calendar_view'] == 'month') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['month']; ?>
-                                </option>
-                                <option value="agendaWeek" <?php if ($modsForHesk_settings['default_calendar_view'] == 'week') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['week']; ?>
-                                </option>
-                                <option value="agendaDay" <?php if ($modsForHesk_settings['default_calendar_view'] == 'agenda') { echo 'selected'; } ?>>
-                                    <?php echo $hesklang['calendar_day']; ?>
-                                </option>
-                            </select>
-                        </div>
+                        ?>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="first-day-of-week" class="col-sm-4 col-xs-12 control-label">
+                        <?php echo $hesklang['first_day_of_week']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['first_day_of_week']; ?>"
+                           data-content="<?php echo $hesklang['first_day_of_week_help']; ?>"></i>
+                    </label>
+                    <div class="col-sm-8 col-xs-12">
+                        <select name="first-day-of-week" class="form-control">
+                            <option value="0" <?php if ($modsForHesk_settings['first_day_of_week'] == '0') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d0']; ?>
+                            </option>
+                            <option value="1" <?php if ($modsForHesk_settings['first_day_of_week'] == '1') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d1']; ?>
+                            </option>
+                            <option value="2" <?php if ($modsForHesk_settings['first_day_of_week'] == '2') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d2']; ?>
+                            </option>
+                            <option value="3" <?php if ($modsForHesk_settings['first_day_of_week'] == '3') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d3']; ?>
+                            </option>
+                            <option value="4" <?php if ($modsForHesk_settings['first_day_of_week'] == '4') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d4']; ?>
+                            </option>
+                            <option value="5" <?php if ($modsForHesk_settings['first_day_of_week'] == '5') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d5']; ?>
+                            </option>
+                            <option value="6" <?php if ($modsForHesk_settings['first_day_of_week'] == '6') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['d6']; ?>
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="default-view" class="col-sm-4 col-xs-12 control-label">
+                        <?php echo $hesklang['default_view']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['default_view']; ?>"
+                           data-content="<?php echo $hesklang['default_view_help']; ?>"></i>
+                    </label>
+                    <div class="col-sm-8 col-xs-12">
+                        <select name="default-view" class="form-control">
+                            <option value="month" <?php if ($modsForHesk_settings['default_calendar_view'] == 'month') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['month']; ?>
+                            </option>
+                            <option value="agendaWeek" <?php if ($modsForHesk_settings['default_calendar_view'] == 'week') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['week']; ?>
+                            </option>
+                            <option value="agendaDay" <?php if ($modsForHesk_settings['default_calendar_view'] == 'agenda') { echo 'selected'; } ?>>
+                                <?php echo $hesklang['calendar_day']; ?>
+                            </option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
 
-                <!-- Custom Fields Tab -->
-                <div class="tab-pane fade in" id="customFields">
-                    <h6 class="bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)"
-                                                                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i
-                                class="fa fa-question-circle settingsquestionmark"></i></a></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
+        <!-- Custom Field Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_4']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['custom_use']; ?> <a href="Javascript:void(0)"
+                                                                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>custom.html#41','400','500')"><i
+                            class="fa fa-question-circle settingsquestionmark"></i></a></h4>
 
 
-                    <div class="form-group">
-                        <label for="custom-field-setting" class="col-sm-4 col-xs-12 control-label">
+                <div class="form-group">
+                    <label for="custom-field-setting" class="col-sm-4 col-xs-12 control-label">
                           <span class="label label-primary"
                                 data-toggle="tooltip"
                                 title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['custom_field_setting']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['custom_field_setting']; ?>"
-                               data-content="<?php echo $hesklang['custom_field_setting_help']; ?>"></i>
-                        </label>
+                        <?php echo $hesklang['custom_field_setting']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['custom_field_setting']; ?>"
+                           data-content="<?php echo $hesklang['custom_field_setting_help']; ?>"></i>
+                    </label>
 
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="custom-field-setting"
-                                           name="custom-field-setting"
-                                           type="checkbox"
-                                           onchange="changeText('fieldNameHeader',
-                                               '<?php echo $hesklang['custom_language_key']; ?>',
-                                               '<?php echo $hesklang['custom_n']; ?>',
-                                               this)"
-                                        <?php if ($modsForHesk_settings['custom_field_setting']) {
-                                            echo 'checked';
-                                        } ?>> <?php echo $hesklang['enable_custom_field_language']; ?>
-                                </label>
-                            </div>
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="custom-field-setting"
+                                       name="custom-field-setting"
+                                       type="checkbox"
+                                       onchange="changeText('fieldNameHeader',
+                                           '<?php echo $hesklang['custom_language_key']; ?>',
+                                           '<?php echo $hesklang['custom_n']; ?>',
+                                           this)"
+                                    <?php if ($modsForHesk_settings['custom_field_setting']) {
+                                        echo 'checked';
+                                    } ?>> <?php echo $hesklang['enable_custom_field_language']; ?>
+                            </label>
                         </div>
                     </div>
-                    <table class="table table-hover">
-                        <tr>
-                            <th><?php echo $hesklang['enable']; ?></th>
-                            <th><?php echo $hesklang['s_type']; ?></th>
-                            <th><?php echo $hesklang['custom_r']; ?></th>
-                            <th id="fieldNameHeader">
-                                <?php if ($modsForHesk_settings['custom_field_setting']) {
-                                    echo $hesklang['custom_language_key'];
-                                } else {
-                                    echo $hesklang['custom_n'];
-                                } ?>
-                            </th>
-                            <th><?php echo $hesklang['custom_place']; ?></th>
-                            <th><?php echo $hesklang['opt']; ?></th>
-                        </tr>
+                </div>
+                <table class="table table-hover">
+                    <tr>
+                        <th><?php echo $hesklang['enable']; ?></th>
+                        <th><?php echo $hesklang['s_type']; ?></th>
+                        <th><?php echo $hesklang['custom_r']; ?></th>
+                        <th id="fieldNameHeader">
+                            <?php if ($modsForHesk_settings['custom_field_setting']) {
+                                echo $hesklang['custom_language_key'];
+                            } else {
+                                echo $hesklang['custom_n'];
+                            } ?>
+                        </th>
+                        <th><?php echo $hesklang['custom_place']; ?></th>
+                        <th><?php echo $hesklang['opt']; ?></th>
+                    </tr>
 
-                        <?php
-                        for ($i = 1; $i <= 20; $i++) {
-                            $this_field = $hesk_settings['custom_fields']['custom' . $i];
+                    <?php
+                    for ($i = 1; $i <= 20; $i++) {
+                        $this_field = $hesk_settings['custom_fields']['custom' . $i];
 
-                            $onload_locally = $this_field['use'] ? '' : ' disabled="disabled" ';
+                        $onload_locally = $this_field['use'] ? '' : ' disabled="disabled" ';
 
-                            echo '
+                        echo '
                     <tr>
                     <td><div class="checkbox"><label><input type="checkbox" name="s_custom' . $i . '_use" value="1" id="c' . $i . '1" ';
-                            if ($this_field['use']) {
-                                echo 'checked="checked"';
-                            }
-                            echo ' onclick="hesk_attach_toggle(\'c' . $i . '1\',new Array(\'s_custom' . $i . '_type\',\'s_custom' . $i . '_req\',\'s_custom' . $i . '_name\',\'c' . $i . '5\',\'c' . $i . '6\'))" /> ' . $hesklang['yes'] . '</label></div></td>
+                        if ($this_field['use']) {
+                            echo 'checked="checked"';
+                        }
+                        echo ' onclick="hesk_attach_toggle(\'c' . $i . '1\',new Array(\'s_custom' . $i . '_type\',\'s_custom' . $i . '_req\',\'s_custom' . $i . '_name\',\'c' . $i . '5\',\'c' . $i . '6\'))" /> ' . $hesklang['yes'] . '</label></div></td>
                     <td>
                         <select class="form-control" name="s_custom' . $i . '_type" id="s_custom' . $i . '_type" ' . $onload_locally . '>
                         <option value="text"     ' . ($this_field['type'] == 'text' ? 'selected="selected"' : '') . '>' . $hesklang['stf'] . '</option>
@@ -2138,10 +2161,10 @@ if (defined('HESK_DEMO')) {
                         </select>
                     </td>
                     <td><div class="checkbox"><label><input type="checkbox" name="s_custom' . $i . '_req" value="1" id="s_custom' . $i . '_req" ';
-                            if ($this_field['req']) {
-                                echo 'checked="checked"';
-                            }
-                            echo $onload_locally . ' /> ' . $hesklang['yes'] . '</label></div></td>
+                        if ($this_field['req']) {
+                            echo 'checked="checked"';
+                        }
+                        echo $onload_locally . ' /> ' . $hesklang['yes'] . '</label></div></td>
                     <td><input class="form-control" type="text" name="s_custom' . $i . '_name" size="20" maxlength="255" id="s_custom' . $i . '_name" value="' . $this_field['name'] . '"' . $onload_locally . ' /></td>
                     <td>
                         <div class="radio"><label><input type="radio" name="s_custom' . $i . '_place" value="0" id="c' . $i . '5" ' . ($this_field['place'] ? '' : 'checked="checked"') . '  ' . $onload_locally . ' /> ' . $hesklang['place_before'] . '</label></div><br />
@@ -2155,45 +2178,54 @@ if (defined('HESK_DEMO')) {
 
                     </tr>
                     ';
-                        } // End FOR
-                        ?>
-                    </table>
+                    } // End FOR
+                    ?>
+                </table>
+            </div>
+        </div>
+
+        <!-- Email Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_6']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
                 </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['emlsend']; ?></h4>
 
+                <div class="form-group">
+                    <label for="s_smtp" class="col-sm-3 control-label"><?php echo $hesklang['emlsend2']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                <!-- Email Tab -->
-                <div class="tab-pane fade in" id="email">
-                    <h6 class="bold"><?php echo $hesklang['emlsend']; ?></h6>
+                    <div class="col-sm-9">
+                        <?php
+                        $on = '';
+                        $off = '';
+                        $mailgunOn = '';
+                        $onload_div = 'none';
+                        $onload_mailgun = 'none';
+                        $onload_status = '';
 
-                    <div class="footerWithBorder blankSpace"></div>
+                        if ($hesk_settings['smtp']) {
+                            $on = 'checked="checked"';
+                            $onload_div = 'block';
+                        } elseif ($modsForHesk_settings['use_mailgun']) {
+                            $mailgunOn = 'checked="checked"';
+                            $onload_mailgun = 'block';
+                        } else {
+                            $off = 'checked="checked"';
+                            $onload_status = ' disabled="disabled" ';
+                        }
 
-                    <div class="form-group">
-                        <label for="s_smtp" class="col-sm-3 control-label"><?php echo $hesklang['emlsend2']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <?php
-                            $on = '';
-                            $off = '';
-                            $mailgunOn = '';
-                            $onload_div = 'none';
-                            $onload_mailgun = 'none';
-                            $onload_status = '';
-
-                            if ($hesk_settings['smtp']) {
-                                $on = 'checked="checked"';
-                                $onload_div = 'block';
-                            } elseif ($modsForHesk_settings['use_mailgun']) {
-                                $mailgunOn = 'checked="checked"';
-                                $onload_mailgun = 'block';
-                            } else {
-                                $off = 'checked="checked"';
-                                $onload_status = ' disabled="disabled" ';
-                            }
-
-                            echo '
+                        echo '
                         <div class="radio">
                             <label>
                                 <input type="radio" name="s_smtp" value="0"
@@ -2222,1280 +2254,1289 @@ if (defined('HESK_DEMO')) {
                                     </i>
                             </label>
                         </div>';
-                            ?>
-                            <input type="hidden" name="tmp_smtp_host_name"
-                                   value="<?php echo $hesk_settings['smtp_host_name']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_host_port"
-                                   value="<?php echo $hesk_settings['smtp_host_port']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_timeout"
-                                   value="<?php echo $hesk_settings['smtp_timeout']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_user"
-                                   value="<?php echo $hesk_settings['smtp_user']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_password"
-                                   value="<?php echo $hesk_settings['smtp_password']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_ssl" value="<?php echo $hesk_settings['smtp_ssl']; ?>"/>
-                            <input type="hidden" name="tmp_smtp_tls" value="<?php echo $hesk_settings['smtp_tls']; ?>"/>
+                        ?>
+                        <input type="hidden" name="tmp_smtp_host_name"
+                               value="<?php echo $hesk_settings['smtp_host_name']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_host_port"
+                               value="<?php echo $hesk_settings['smtp_host_port']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_timeout"
+                               value="<?php echo $hesk_settings['smtp_timeout']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_user"
+                               value="<?php echo $hesk_settings['smtp_user']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_password"
+                               value="<?php echo $hesk_settings['smtp_password']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_ssl" value="<?php echo $hesk_settings['smtp_ssl']; ?>"/>
+                        <input type="hidden" name="tmp_smtp_tls" value="<?php echo $hesk_settings['smtp_tls']; ?>"/>
 
 
-                        </div>
-                    </div>
-                    <div id="mailgun_settings" style="display:<?php echo $onload_mailgun; ?>">
-                        <div class="form-group">
-                            <label for="mailgun_api_key" class="col-sm-3 control-label">
-                            <span class="label label-primary"
-                                  data-toggle="tooltip"
-                                  title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                <?php echo $hesklang['mailgun_api_key']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   title="<?php echo $hesklang['mailgun_api_key']; ?>"
-                                   data-content="<?php echo $hesklang['mailgun_api_key_help']; ?>">
-                                </i>
-                            </label>
-
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['mailgun_api_key']); ?>"
-                                       id="mailgun_api_key" name="mailgun_api_key"
-                                       value="<?php echo $modsForHesk_settings['mailgun_api_key']; ?>">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="mailgun_domain" class="col-sm-3 control-label">
-                            <span class="label label-primary"
-                                  data-toggle="tooltip"
-                                  title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                                <?php echo $hesklang['mailgun_domain']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   title="<?php echo $hesklang['mailgun_domain']; ?>"
-                                   data-content="<?php echo $hesklang['mailgun_domain_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['mailgun_domain']); ?>"
-                                       id="mailgun_domain" name="mailgun_domain"
-                                       value="<?php echo $modsForHesk_settings['mailgun_domain']; ?>">
-                            </div>
-                        </div>
-                    </div>
-                    <div id="smtp_settings" style="display:<?php echo $onload_div; ?>">
-                        <div class="form-group">
-                            <label for="s_smtp_host_name"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['smtph']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['smtph']); ?>" id="s1"
-                                       name="s_smtp_host_name" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['smtp_host_name']; ?>" <?php echo $onload_status; ?> />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_host_port"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['smtpp']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-3">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['smtpp']); ?>" id="s2"
-                                       name="s_smtp_host_port" size="5" maxlength="255"
-                                       value="<?php echo $hesk_settings['smtp_host_port']; ?>" <?php echo $onload_status; ?> />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_timeout" class="col-sm-3 control-label"><?php echo $hesklang['smtpt']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-3">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['smtpt']); ?>" id="s3"
-                                       name="s_smtp_timeout" size="5" maxlength="255"
-                                       value="<?php echo $hesk_settings['smtp_timeout']; ?>" <?php echo $onload_status; ?> />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_ssl" class="col-sm-3 control-label"><?php echo $hesklang['smtpssl']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9 form-inline">
-                                <?php
-                                $on = $hesk_settings['smtp_ssl'] ? 'checked="checked"' : '';
-                                $off = $hesk_settings['smtp_ssl'] ? '' : 'checked="checked"';
-                                echo '
-                            <div class="radio"><label><input type="radio" name="s_smtp_ssl" value="0" id="s6" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                            <div class="radio"><label><input type="radio" name="s_smtp_ssl" value="1" id="s7" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_tls" class="col-sm-3 control-label"><?php echo $hesklang['smtptls']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9 form-inline">
-                                <?php
-                                $on = $hesk_settings['smtp_tls'] ? 'checked="checked"' : '';
-                                $off = $hesk_settings['smtp_tls'] ? '' : 'checked="checked"';
-                                echo '
-                            <div class="radio"><label><input type="radio" name="s_smtp_tls" value="0" id="s8" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                            <div class="radio"><label><input type="radio" name="s_smtp_tls" value="1" id="s9" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_user" class="col-sm-3 control-label"><?php echo $hesklang['smtpu']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['smtpu']); ?>" id="s4"
-                                       name="s_smtp_user" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['smtp_user']; ?>" <?php echo $onload_status; ?>
-                                       autocomplete="off"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_smtp_password"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['smtpw']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9">
-                                <input type="password" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['smtpw']); ?>" id="s5"
-                                       name="s_smtp_password" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['smtp_password']; ?>" <?php echo $onload_status; ?>
-                                       autocomplete="off"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-sm-9 col-sm-offset-3">
-                                <input type="button" class="btn btn-default" onclick="hesk_testSMTP()"
-                                       value="<?php echo $hesklang['smtptest']; ?>"/>
-                            </div>
-                        </div>
-
-                        <!-- START SMTP TEST -->
-                        <div id="smtp_test" style="display:none">
-                        </div>
-
-                        <script language="Javascript" type="text/javascript"><!--
-                            function hesk_testSMTP() {
-                                var element = document.getElementById('smtp_test');
-                                element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
-                                element.style.display = 'block';
-
-                                var s_smtp_host_name = document.getElementById('s1').value;
-                                var s_smtp_host_port = document.getElementById('s2').value;
-                                var s_smtp_timeout = document.getElementById('s3').value;
-                                var s_smtp_user = document.getElementById('s4').value;
-                                var s_smtp_password = document.getElementById('s5').value;
-                                var s_smtp_ssl = document.getElementById('s7').checked ? 1 : 0;
-                                var s_smtp_tls = document.getElementById('s9').checked ? 1 : 0;
-
-                                var params = "test=smtp" +
-                                    "&s_smtp_host_name=" + encodeURIComponent(s_smtp_host_name) +
-                                    "&s_smtp_host_port=" + encodeURIComponent(s_smtp_host_port) +
-                                    "&s_smtp_timeout=" + encodeURIComponent(s_smtp_timeout) +
-                                    "&s_smtp_user=" + encodeURIComponent(s_smtp_user) +
-                                    "&s_smtp_password=" + encodeURIComponent(s_smtp_password) +
-                                    "&s_smtp_ssl=" + encodeURIComponent(s_smtp_ssl) +
-                                    "&s_smtp_tls=" + encodeURIComponent(s_smtp_tls);
-
-                                xmlHttp = GetXmlHttpObject();
-                                if (xmlHttp == null) {
-                                    return;
-                                }
-
-                                xmlHttp.open('POST', 'test_connection.php', true);
-                                xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                                xmlHttp.setRequestHeader("Content-length", params.length);
-                                xmlHttp.setRequestHeader("Connection", "close");
-
-                                xmlHttp.onreadystatechange = function () {
-                                    if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-                                        element.innerHTML = xmlHttp.responseText;
-                                    }
-                                }
-
-                                xmlHttp.send(params);
-                            }
-                            //-->
-                        </script>
-                        <!-- END SMTP TEST -->
-
                     </div>
-                    <!-- END SMTP SETTINGS DIV -->
-
-                    <h6 class="bold"><?php echo $hesklang['emlpipe']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
+                </div>
+                <div id="mailgun_settings" style="display:<?php echo $onload_mailgun; ?>">
                     <div class="form-group">
-                        <label for="s_email_piping" class="col-sm-3 control-label"><?php echo $hesklang['emlpipe']; ?>
+                        <label for="mailgun_api_key" class="col-sm-3 control-label">
+                            <span class="label label-primary"
+                                  data-toggle="tooltip"
+                                  title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                            <?php echo $hesklang['mailgun_api_key']; ?>
+                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                               title="<?php echo $hesklang['mailgun_api_key']; ?>"
+                               data-content="<?php echo $hesklang['mailgun_api_key_help']; ?>">
+                            </i>
+                        </label>
+
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['mailgun_api_key']); ?>"
+                                   id="mailgun_api_key" name="mailgun_api_key"
+                                   value="<?php echo $modsForHesk_settings['mailgun_api_key']; ?>">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="mailgun_domain" class="col-sm-3 control-label">
+                            <span class="label label-primary"
+                                  data-toggle="tooltip"
+                                  title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                            <?php echo $hesklang['mailgun_domain']; ?>
+                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                               title="<?php echo $hesklang['mailgun_domain']; ?>"
+                               data-content="<?php echo $hesklang['mailgun_domain_help']; ?>"></i>
+                        </label>
+
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['mailgun_domain']); ?>"
+                                   id="mailgun_domain" name="mailgun_domain"
+                                   value="<?php echo $modsForHesk_settings['mailgun_domain']; ?>">
+                        </div>
+                    </div>
+                </div>
+                <div id="smtp_settings" style="display:<?php echo $onload_div; ?>">
+                    <div class="form-group">
+                        <label for="s_smtp_host_name"
+                               class="col-sm-3 control-label"><?php echo $hesklang['smtph']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['smtph']); ?>" id="s1"
+                                   name="s_smtp_host_name" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['smtp_host_name']; ?>" <?php echo $onload_status; ?> />
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_smtp_host_port"
+                               class="col-sm-3 control-label"><?php echo $hesklang['smtpp']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['smtpp']); ?>" id="s2"
+                                   name="s_smtp_host_port" size="5" maxlength="255"
+                                   value="<?php echo $hesk_settings['smtp_host_port']; ?>" <?php echo $onload_status; ?> />
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_smtp_timeout" class="col-sm-3 control-label"><?php echo $hesklang['smtpt']; ?>
                             <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#54','400','500')"><i
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['smtpt']); ?>" id="s3"
+                                   name="s_smtp_timeout" size="5" maxlength="255"
+                                   value="<?php echo $hesk_settings['smtp_timeout']; ?>" <?php echo $onload_status; ?> />
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_smtp_ssl" class="col-sm-3 control-label"><?php echo $hesklang['smtpssl']; ?>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
                                     class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
                         <div class="col-sm-9 form-inline">
                             <?php
-                            $on = $hesk_settings['email_piping'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['email_piping'] ? '' : 'checked="checked"';
+                            $on = $hesk_settings['smtp_ssl'] ? 'checked="checked"' : '';
+                            $off = $hesk_settings['smtp_ssl'] ? '' : 'checked="checked"';
                             echo '
-                        <div class="radio"><label><input type="radio" name="s_email_piping" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                        <div class="radio"><label><input type="radio" name="s_email_piping" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                            <div class="radio"><label><input type="radio" name="s_smtp_ssl" value="0" id="s6" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                            <div class="radio"><label><input type="radio" name="s_smtp_ssl" value="1" id="s7" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
                             ?>
                         </div>
                     </div>
-
-                    <h6 class="bold"><?php echo $hesklang['pop3']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
                     <div class="form-group">
-                        <label for="s_pop3" class="col-sm-3 control-label"><?php echo $hesklang['pop3']; ?> <a
+                        <label for="s_smtp_tls" class="col-sm-3 control-label"><?php echo $hesklang['smtptls']; ?>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9 form-inline">
+                            <?php
+                            $on = $hesk_settings['smtp_tls'] ? 'checked="checked"' : '';
+                            $off = $hesk_settings['smtp_tls'] ? '' : 'checked="checked"';
+                            echo '
+                            <div class="radio"><label><input type="radio" name="s_smtp_tls" value="0" id="s8" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                            <div class="radio"><label><input type="radio" name="s_smtp_tls" value="1" id="s9" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
+                            ?>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_smtp_user" class="col-sm-3 control-label"><?php echo $hesklang['smtpu']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['smtpu']); ?>" id="s4"
+                                   name="s_smtp_user" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['smtp_user']; ?>" <?php echo $onload_status; ?>
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_smtp_password"
+                               class="col-sm-3 control-label"><?php echo $hesklang['smtpw']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#55','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
+                            <input type="password" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['smtpw']); ?>" id="s5"
+                                   name="s_smtp_password" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['smtp_password']; ?>" <?php echo $onload_status; ?>
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-9 col-sm-offset-3">
+                            <input type="button" class="btn btn-default" onclick="hesk_testSMTP()"
+                                   value="<?php echo $hesklang['smtptest']; ?>"/>
+                        </div>
+                    </div>
+
+                    <!-- START SMTP TEST -->
+                    <div id="smtp_test" style="display:none">
+                    </div>
+
+                    <script language="Javascript" type="text/javascript"><!--
+                        function hesk_testSMTP() {
+                            var element = document.getElementById('smtp_test');
+                            element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
+                            element.style.display = 'block';
+
+                            var s_smtp_host_name = document.getElementById('s1').value;
+                            var s_smtp_host_port = document.getElementById('s2').value;
+                            var s_smtp_timeout = document.getElementById('s3').value;
+                            var s_smtp_user = document.getElementById('s4').value;
+                            var s_smtp_password = document.getElementById('s5').value;
+                            var s_smtp_ssl = document.getElementById('s7').checked ? 1 : 0;
+                            var s_smtp_tls = document.getElementById('s9').checked ? 1 : 0;
+
+                            var params = "test=smtp" +
+                                "&s_smtp_host_name=" + encodeURIComponent(s_smtp_host_name) +
+                                "&s_smtp_host_port=" + encodeURIComponent(s_smtp_host_port) +
+                                "&s_smtp_timeout=" + encodeURIComponent(s_smtp_timeout) +
+                                "&s_smtp_user=" + encodeURIComponent(s_smtp_user) +
+                                "&s_smtp_password=" + encodeURIComponent(s_smtp_password) +
+                                "&s_smtp_ssl=" + encodeURIComponent(s_smtp_ssl) +
+                                "&s_smtp_tls=" + encodeURIComponent(s_smtp_tls);
+
+                            xmlHttp = GetXmlHttpObject();
+                            if (xmlHttp == null) {
+                                return;
+                            }
+
+                            xmlHttp.open('POST', 'test_connection.php', true);
+                            xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+                            xmlHttp.setRequestHeader("Content-length", params.length);
+                            xmlHttp.setRequestHeader("Connection", "close");
+
+                            xmlHttp.onreadystatechange = function () {
+                                if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                                    element.innerHTML = xmlHttp.responseText;
+                                }
+                            }
+
+                            xmlHttp.send(params);
+                        }
+                        //-->
+                    </script>
+                    <!-- END SMTP TEST -->
+
+                </div>
+                <!-- END SMTP SETTINGS DIV -->
+
+                <h4 class="bold"><?php echo $hesklang['emlpipe']; ?></h4>
+                <div class="form-group">
+                    <label for="s_email_piping" class="col-sm-3 control-label"><?php echo $hesklang['emlpipe']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#54','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $on = $hesk_settings['email_piping'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['email_piping'] ? '' : 'checked="checked"';
+                        echo '
+                        <div class="radio"><label><input type="radio" name="s_email_piping" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                        <div class="radio"><label><input type="radio" name="s_email_piping" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
+                    </div>
+                </div>
+
+                <h4 class="bold"><?php echo $hesklang['pop3']; ?></h4>
+                <div class="form-group">
+                    <label for="s_pop3" class="col-sm-3 control-label"><?php echo $hesklang['pop3']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $on = '';
+                        $off = '';
+                        $onload_div = 'none';
+                        $onload_status = '';
+
+                        if ($hesk_settings['pop3']) {
+                            $on = 'checked="checked"';
+                            $onload_div = 'block';
+                        } else {
+                            $off = 'checked="checked"';
+                            $onload_status = ' disabled="disabled" ';
+                        }
+
+                        echo '
+                        <div class="radio"><label><input type="radio" name="s_pop3" value="0" onclick="hesk_attach_disable(new Array(\'p0\',\'p1\',\'p2\',\'p3\',\'p4\',\'p5\',\'p6\',\'p7\',\'p8\'))" onchange="hesk_toggleLayerDisplay(\'pop3_settings\');" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                        <div class="radio"><label><input type="radio" name="s_pop3" value="1" onclick="hesk_attach_enable(new Array(\'p0\',\'p1\',\'p2\',\'p3\',\'p4\',\'p5\',\'p6\',\'p7\',\'p8\'))" onchange="hesk_toggleLayerDisplay(\'pop3_settings\');"  ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
+                        <input type="hidden" name="tmp_pop3_host_name"
+                               value="<?php echo $hesk_settings['pop3_host_name']; ?>"/>
+                        <input type="hidden" name="tmp_pop3_host_port"
+                               value="<?php echo $hesk_settings['pop3_host_port']; ?>"/>
+                        <input type="hidden" name="tmp_pop3_user"
+                               value="<?php echo $hesk_settings['pop3_user']; ?>"/>
+                        <input type="hidden" name="tmp_pop3_password"
+                               value="<?php echo $hesk_settings['pop3_password']; ?>"/>
+                        <input type="hidden" name="tmp_pop3_tls" value="<?php echo $hesk_settings['pop3_tls']; ?>"/>
+                        <input type="hidden" name="tmp_pop3_keep"
+                               value="<?php echo $hesk_settings['pop3_keep']; ?>"/>
+                    </div>
+                </div>
+                <div id="pop3_settings" style="display:<?php echo $onload_div; ?>">
+                    <div class="form-group">
+                        <label for="s_pop3_job_wait" class="col-sm-3 control-label"><?php echo $hesklang['pjt']; ?>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['pjt']); ?>" id="p0"
+                                   name="s_pop3_job_wait" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['pop3_job_wait']; ?>" <?php echo $onload_status; ?> /> <?php echo $hesklang['pjt2']; ?>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_pop3_host_name"
+                               class="col-sm-3 control-label"><?php echo $hesklang['pop3h']; ?> <a
                                 href="Javascript:void(0)"
                                 onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
                                     class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                        <div class="col-sm-9 form-inline">
-                            <?php
-                            $on = '';
-                            $off = '';
-                            $onload_div = 'none';
-                            $onload_status = '';
-
-                            if ($hesk_settings['pop3']) {
-                                $on = 'checked="checked"';
-                                $onload_div = 'block';
-                            } else {
-                                $off = 'checked="checked"';
-                                $onload_status = ' disabled="disabled" ';
-                            }
-
-                            echo '
-                        <div class="radio"><label><input type="radio" name="s_pop3" value="0" onclick="hesk_attach_disable(new Array(\'p0\',\'p1\',\'p2\',\'p3\',\'p4\',\'p5\',\'p6\',\'p7\',\'p8\'))" onchange="hesk_toggleLayerDisplay(\'pop3_settings\');" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                        <div class="radio"><label><input type="radio" name="s_pop3" value="1" onclick="hesk_attach_enable(new Array(\'p0\',\'p1\',\'p2\',\'p3\',\'p4\',\'p5\',\'p6\',\'p7\',\'p8\'))" onchange="hesk_toggleLayerDisplay(\'pop3_settings\');"  ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                            ?>
-                            <input type="hidden" name="tmp_pop3_host_name"
-                                   value="<?php echo $hesk_settings['pop3_host_name']; ?>"/>
-                            <input type="hidden" name="tmp_pop3_host_port"
-                                   value="<?php echo $hesk_settings['pop3_host_port']; ?>"/>
-                            <input type="hidden" name="tmp_pop3_user"
-                                   value="<?php echo $hesk_settings['pop3_user']; ?>"/>
-                            <input type="hidden" name="tmp_pop3_password"
-                                   value="<?php echo $hesk_settings['pop3_password']; ?>"/>
-                            <input type="hidden" name="tmp_pop3_tls" value="<?php echo $hesk_settings['pop3_tls']; ?>"/>
-                            <input type="hidden" name="tmp_pop3_keep"
-                                   value="<?php echo $hesk_settings['pop3_keep']; ?>"/>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['pop3h']); ?>" id="p1"
+                                   name="s_pop3_host_name" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['pop3_host_name']; ?>" <?php echo $onload_status; ?> />
                         </div>
                     </div>
-                    <div id="pop3_settings" style="display:<?php echo $onload_div; ?>">
-                        <div class="form-group">
-                            <label for="s_pop3_job_wait" class="col-sm-3 control-label"><?php echo $hesklang['pjt']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    <div class="form-group">
+                        <label for="s_pop3_host_port"
+                               class="col-sm-3 control-label"><?php echo $hesklang['pop3p']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['pjt']); ?>" id="p0"
-                                       name="s_pop3_job_wait" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['pop3_job_wait']; ?>" <?php echo $onload_status; ?> /> <?php echo $hesklang['pjt2']; ?>
-                            </div>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['pop3p']); ?>" id="p2"
+                                   name="s_pop3_host_port" size="5" maxlength="255"
+                                   value="<?php echo $hesk_settings['pop3_host_port']; ?>" <?php echo $onload_status; ?> />
                         </div>
-                        <div class="form-group">
-                            <label for="s_pop3_host_name"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['pop3h']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_pop3_tls" class="col-sm-3 control-label"><?php echo $hesklang['pop3tls']; ?>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['pop3h']); ?>" id="p1"
-                                       name="s_pop3_host_name" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['pop3_host_name']; ?>" <?php echo $onload_status; ?> />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_pop3_host_port"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['pop3p']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-3">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['pop3p']); ?>" id="p2"
-                                       name="s_pop3_host_port" size="5" maxlength="255"
-                                       value="<?php echo $hesk_settings['pop3_host_port']; ?>" <?php echo $onload_status; ?> />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_pop3_tls" class="col-sm-3 control-label"><?php echo $hesklang['pop3tls']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9 form-inline">
-                                <?php
-                                $on = $hesk_settings['pop3_tls'] ? 'checked="checked"' : '';
-                                $off = $hesk_settings['pop3_tls'] ? '' : 'checked="checked"';
-                                echo '
+                        <div class="col-sm-9 form-inline">
+                            <?php
+                            $on = $hesk_settings['pop3_tls'] ? 'checked="checked"' : '';
+                            $off = $hesk_settings['pop3_tls'] ? '' : 'checked="checked"';
+                            echo '
                             <div class="radio"><label><input type="radio" name="s_pop3_tls" value="0" id="p3" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
                             <div class="radio"><label><input type="radio" name="s_pop3_tls" value="1" id="p4" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_pop3_keep" class="col-sm-3 control-label"><?php echo $hesklang['pop3keep']; ?>
-                                <a href="Javascript:void(0)"
-                                   onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9 form-inline">
-                                <?php
-                                $on = $hesk_settings['pop3_keep'] ? 'checked="checked"' : '';
-                                $off = $hesk_settings['pop3_keep'] ? '' : 'checked="checked"';
-                                echo '
-                            <div class="radio"><label><input type="radio" name="s_pop3_keep" value="0" id="p7" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>
-                            <div class="radio"><label><input type="radio" name="s_pop3_keep" value="1" id="p8" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
-                                ?>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_pop3_user" class="col-sm-3 control-label"><?php echo $hesklang['pop3u']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['pop3u']); ?>" id="p5"
-                                       name="s_pop3_user" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['pop3_user']; ?>" <?php echo $onload_status; ?>
-                                       autocomplete="off"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="s_pop3_password"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['pop3w']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                            <div class="col-sm-9">
-                                <input type="password" class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['pop3w']); ?>" id="p6"
-                                       name="s_pop3_password" size="40" maxlength="255"
-                                       value="<?php echo $hesk_settings['pop3_password']; ?>" <?php echo $onload_status; ?>
-                                       autocomplete="off"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-sm-9 col-sm-offset-3">
-                                <input type="button" class="btn btn-default move-down-4" onclick="hesk_testPOP3()"
-                                       value="<?php echo $hesklang['pop3test']; ?>"/>
-                            </div>
-                        </div>
-                        <table border="0" width="100%">
-                            <tr>
-                                <td class="text-right" width="200"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td class="text-right" width="200">&nbsp;</td>
-                                <td></td>
-                            </tr>
-                        </table>
-
-                        <!-- START POP3 TEST -->
-                        <div id="pop3_test" style="display:none">
-                        </div>
-
-                        <script language="Javascript" type="text/javascript"><!--
-                            function hesk_testPOP3() {
-                                var element = document.getElementById('pop3_test');
-                                element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
-                                element.style.display = 'block';
-
-                                var s_pop3_host_name = document.getElementById('p1').value;
-                                var s_pop3_host_port = document.getElementById('p2').value;
-                                var s_pop3_user = document.getElementById('p5').value;
-                                var s_pop3_password = document.getElementById('p6').value;
-                                var s_pop3_tls = document.getElementById('p4').checked ? 1 : 0;
-
-                                var params = "test=pop3" +
-                                    "&s_pop3_host_name=" + encodeURIComponent(s_pop3_host_name) +
-                                    "&s_pop3_host_port=" + encodeURIComponent(s_pop3_host_port) +
-                                    "&s_pop3_user=" + encodeURIComponent(s_pop3_user) +
-                                    "&s_pop3_password=" + encodeURIComponent(s_pop3_password) +
-                                    "&s_pop3_tls=" + encodeURIComponent(s_pop3_tls);
-
-                                xmlHttp = GetXmlHttpObject();
-                                if (xmlHttp == null) {
-                                    return;
-                                }
-
-                                xmlHttp.open('POST', 'test_connection.php', true);
-                                xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                                xmlHttp.setRequestHeader("Content-length", params.length);
-                                xmlHttp.setRequestHeader("Connection", "close");
-
-                                xmlHttp.onreadystatechange = function () {
-                                    if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-                                        element.innerHTML = xmlHttp.responseText;
-                                    }
-                                }
-
-                                xmlHttp.send(params);
-                            }
-                            //-->
-                        </script>
-                        <!-- END POP3 TEST -->
-
-                    </div>
-                    <!-- END POP3 SETTINGS DIV -->
-
-                    <h6 class="bold"><?php echo $hesklang['loops']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_loop_hits" class="col-sm-3 control-label"><?php echo $hesklang['looph']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#60','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['looph']); ?>" name="s_loop_hits"
-                                   size="5" maxlength="5" value="<?php echo $hesk_settings['loop_hits']; ?>"/>
+                            ?>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="s_loop_time" class="col-sm-3 control-label"><?php echo $hesklang['loopt']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#60','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['loopt']); ?>" name="s_loop_time"
-                                   size="5" maxlength="5" value="<?php echo $hesk_settings['loop_time']; ?>"/>
-                        </div>
-                        <div class="col-sm-6 pad-right-0">
-                            <p class="form-control-static"><?php echo $hesklang['ss']; ?></p>
-                        </div>
-                    </div>
-
-                    <h6 class="bold"><?php echo $hesklang['suge']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_detect_typos" class="col-sm-3 control-label"><?php echo $hesklang['suge']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#62','400','500')"><i
+                        <label for="s_pop3_keep" class="col-sm-3 control-label"><?php echo $hesklang['pop3keep']; ?>
+                            <a href="Javascript:void(0)"
+                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
                                     class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
                         <div class="col-sm-9 form-inline">
                             <?php
-                            $on = '';
-                            $off = '';
-                            $onload_div = 'none';
-                            $onload_status = '';
-
-                            if ($hesk_settings['detect_typos']) {
-                                $on = 'checked="checked"';
-                                $onload_div = 'block';
-                            } else {
-                                $off = 'checked="checked"';
-                                $onload_status = ' disabled="disabled" ';
-                            }
-
+                            $on = $hesk_settings['pop3_keep'] ? 'checked="checked"' : '';
+                            $off = $hesk_settings['pop3_keep'] ? '' : 'checked="checked"';
                             echo '
-                            <div class="radio"><label><input type="radio" name="s_detect_typos" value="0" onclick="hesk_attach_disable(new Array(\'d1\'))" onchange="hesk_toggleLayerDisplay(\'detect_typos\');" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                            <div class="radio"><label><input type="radio" name="s_detect_typos" value="1" onclick="hesk_attach_enable(new Array(\'d1\'))" onchange="hesk_toggleLayerDisplay(\'detect_typos\');"  ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                            <div class="radio"><label><input type="radio" name="s_pop3_keep" value="0" id="p7" ' . $off . ' ' . $onload_status . ' /> ' . $hesklang['off'] . '</label></div>
+                            <div class="radio"><label><input type="radio" name="s_pop3_keep" value="1" id="p8" ' . $on . ' ' . $onload_status . ' /> ' . $hesklang['on'] . '</label></div>';
                             ?>
                         </div>
                     </div>
-                    <div id="detect_typos" style="display:<?php echo $onload_div; ?>">
-                        <div class="form-group">
-                            <label for="s_email_providers"
-                                   class="col-sm-3 control-label"><?php echo $hesklang['epro']; ?> <a
-                                    href="Javascript:void(0)"
-                                    onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#63','400','500')"><i
-                                        class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                    <div class="form-group">
+                        <label for="s_pop3_user" class="col-sm-3 control-label"><?php echo $hesklang['pop3u']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
 
-                            <div class="col-sm-9">
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['pop3u']); ?>" id="p5"
+                                   name="s_pop3_user" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['pop3_user']; ?>" <?php echo $onload_status; ?>
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="s_pop3_password"
+                               class="col-sm-3 control-label"><?php echo $hesklang['pop3w']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
+                            <input type="password" class="form-control"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['pop3w']); ?>" id="p6"
+                                   name="s_pop3_password" size="40" maxlength="255"
+                                   value="<?php echo $hesk_settings['pop3_password']; ?>" <?php echo $onload_status; ?>
+                                   autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-9 col-sm-offset-3">
+                            <input type="button" class="btn btn-default move-down-4" onclick="hesk_testPOP3()"
+                                   value="<?php echo $hesklang['pop3test']; ?>"/>
+                        </div>
+                    </div>
+                    <table border="0" width="100%">
+                        <tr>
+                            <td class="text-right" width="200"></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td class="text-right" width="200">&nbsp;</td>
+                            <td></td>
+                        </tr>
+                    </table>
+
+                    <!-- START POP3 TEST -->
+                    <div id="pop3_test" style="display:none">
+                    </div>
+
+                    <script language="Javascript" type="text/javascript"><!--
+                        function hesk_testPOP3() {
+                            var element = document.getElementById('pop3_test');
+                            element.innerHTML = '<img src="<?php echo HESK_PATH; ?>img/loading.gif" width="24" height="24" alt="" border="0" style="vertical-align:text-bottom" /> <i><?php echo addslashes($hesklang['contest']); ?></i>';
+                            element.style.display = 'block';
+
+                            var s_pop3_host_name = document.getElementById('p1').value;
+                            var s_pop3_host_port = document.getElementById('p2').value;
+                            var s_pop3_user = document.getElementById('p5').value;
+                            var s_pop3_password = document.getElementById('p6').value;
+                            var s_pop3_tls = document.getElementById('p4').checked ? 1 : 0;
+
+                            var params = "test=pop3" +
+                                "&s_pop3_host_name=" + encodeURIComponent(s_pop3_host_name) +
+                                "&s_pop3_host_port=" + encodeURIComponent(s_pop3_host_port) +
+                                "&s_pop3_user=" + encodeURIComponent(s_pop3_user) +
+                                "&s_pop3_password=" + encodeURIComponent(s_pop3_password) +
+                                "&s_pop3_tls=" + encodeURIComponent(s_pop3_tls);
+
+                            xmlHttp = GetXmlHttpObject();
+                            if (xmlHttp == null) {
+                                return;
+                            }
+
+                            xmlHttp.open('POST', 'test_connection.php', true);
+                            xmlHttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+                            xmlHttp.setRequestHeader("Content-length", params.length);
+                            xmlHttp.setRequestHeader("Connection", "close");
+
+                            xmlHttp.onreadystatechange = function () {
+                                if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                                    element.innerHTML = xmlHttp.responseText;
+                                }
+                            }
+
+                            xmlHttp.send(params);
+                        }
+                        //-->
+                    </script>
+                    <!-- END POP3 TEST -->
+                </div>
+                <!-- END POP3 SETTINGS DIV -->
+
+                <h4 class="bold"><?php echo $hesklang['loops']; ?></h4>
+                <div class="form-group">
+                    <label for="s_loop_hits" class="col-sm-3 control-label"><?php echo $hesklang['looph']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#60','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['looph']); ?>" name="s_loop_hits"
+                               size="5" maxlength="5" value="<?php echo $hesk_settings['loop_hits']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_loop_time" class="col-sm-3 control-label"><?php echo $hesklang['loopt']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#60','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-3">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['loopt']); ?>" name="s_loop_time"
+                               size="5" maxlength="5" value="<?php echo $hesk_settings['loop_time']; ?>"/>
+                    </div>
+                    <div class="col-sm-6 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['ss']; ?></p>
+                    </div>
+                </div>
+
+                <h4 class="bold"><?php echo $hesklang['suge']; ?></h4>
+                <div class="form-group">
+                    <label for="s_detect_typos" class="col-sm-3 control-label"><?php echo $hesklang['suge']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#62','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $on = '';
+                        $off = '';
+                        $onload_div = 'none';
+                        $onload_status = '';
+
+                        if ($hesk_settings['detect_typos']) {
+                            $on = 'checked="checked"';
+                            $onload_div = 'block';
+                        } else {
+                            $off = 'checked="checked"';
+                            $onload_status = ' disabled="disabled" ';
+                        }
+
+                        echo '
+                            <div class="radio"><label><input type="radio" name="s_detect_typos" value="0" onclick="hesk_attach_disable(new Array(\'d1\'))" onchange="hesk_toggleLayerDisplay(\'detect_typos\');" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                            <div class="radio"><label><input type="radio" name="s_detect_typos" value="1" onclick="hesk_attach_enable(new Array(\'d1\'))" onchange="hesk_toggleLayerDisplay(\'detect_typos\');"  ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
+                    </div>
+                </div>
+                <div id="detect_typos" style="display:<?php echo $onload_div; ?>">
+                    <div class="form-group">
+                        <label for="s_email_providers"
+                               class="col-sm-3 control-label"><?php echo $hesklang['epro']; ?> <a
+                                href="Javascript:void(0)"
+                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#63','400','500')"><i
+                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                        <div class="col-sm-9">
                                 <textarea name="s_email_providers" class="form-control"
                                           placeholder="<?php echo htmlspecialchars($hesklang['epro']); ?>" id="d1"
                                           rows="5"
                                           cols="40"><?php echo implode("\n", $hesk_settings['email_providers']); ?></textarea>
-                            </div>
                         </div>
-                        <table border="0" width="100%">
-                            <tr>
-                                <td class="text-right" style="vertical-align:top" width="200"></td>
-                                <td></td>
-                            </tr>
-                        </table>
                     </div>
+                    <table border="0" width="100%">
+                        <tr>
+                            <td class="text-right" style="vertical-align:top" width="200"></td>
+                            <td></td>
+                        </tr>
+                    </table>
+                </div>
 
-                    <h6 class="bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)"
-                                                                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i
-                                class="fa fa-question-circle settingsquestionmark"></i></a></h6>
+                <h4 class="bold"><?php echo $hesklang['custnot']; ?> <a href="Javascript:void(0)"
+                                                                        onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#65','400','500')"><i
+                            class="fa fa-question-circle settingsquestionmark"></i></a></h4>
+                <div class="form-group">
+                    <label for="s_notify_new"
+                           class="col-sm-3 control-label"><?php echo $hesklang['notnew']; ?></label>
 
-                    <div class="footerWithBorder blankSpace"></div>
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_notify_new" value="1"
+                                          onchange="hesk_toggleLayerDisplay('skip_notify');" <?php if ($hesk_settings['notify_new']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['enable']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div id="skip_notify"
+                     style="display:<?php echo $hesk_settings['notify_new'] ? 'block' : 'none'; ?>">
                     <div class="form-group">
-                        <label for="s_notify_new"
-                               class="col-sm-3 control-label"><?php echo $hesklang['notnew']; ?></label>
-
-                        <div class="col-sm-9">
+                        <div class="col-sm-9 col-sm-offset-3">
                             <div class="checkbox">
-                                <label><input type="checkbox" name="s_notify_new" value="1"
-                                              onchange="hesk_toggleLayerDisplay('skip_notify');" <?php if ($hesk_settings['notify_new']) {
+                                <label><input type="checkbox" name="s_notify_skip_spam"
+                                              value="1" <?php if ($hesk_settings['notify_skip_spam']) {
                                         echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['enable']; ?></label>
+                                    } ?>/> <?php echo $hesklang['enn']; ?></label>
                             </div>
-                        </div>
-                    </div>
-                    <div id="skip_notify"
-                         style="display:<?php echo $hesk_settings['notify_new'] ? 'block' : 'none'; ?>">
-                        <div class="form-group">
-                            <div class="col-sm-9 col-sm-offset-3">
-                                <div class="checkbox">
-                                    <label><input type="checkbox" name="s_notify_skip_spam"
-                                                  value="1" <?php if ($hesk_settings['notify_skip_spam']) {
-                                            echo 'checked="checked"';
-                                        } ?>/> <?php echo $hesklang['enn']; ?></label>
-                                </div>
                                 <textarea name="s_notify_spam_tags" rows="5" cols="40"
                                           class="form-control"><?php echo hesk_htmlspecialchars(implode("\n", $hesk_settings['notify_spam_tags'])); ?></textarea>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_notify_closed"
-                               class="col-sm-3 control-label"><?php echo $hesklang['notclo']; ?></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_notify_closed"
-                                              value="1" <?php if ($hesk_settings['notify_closed']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['enable']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <h6 class="bold"><?php echo $hesklang['other']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_strip_quoted" class="col-sm-3 control-label"><?php echo $hesklang['remqr']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#61','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_strip_quoted"
-                                              value="1" <?php if ($hesk_settings['strip_quoted']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['remqr2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_eml_req_msg" class="col-sm-3 control-label"><?php echo $hesklang['emlreqmsg']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#66','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_eml_req_msg"
-                                              value="1" <?php if ($hesk_settings['eml_req_msg']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['emlreqmsg2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_save_embedded" class="col-sm-3 control-label"><?php echo $hesklang['embed']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#64','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_save_embedded"
-                                              value="1" <?php if ($hesk_settings['save_embedded']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['embed2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_multi_eml" class="col-sm-3 control-label"><?php echo $hesklang['meml']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#57','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <?php
-                                if ($modsForHesk_settings['customer_email_verification_required']) {
-                                    ?>
-                                    <label>
-                                        <i class="fa fa-ban bold red font-size-120" style="margin-left: -20px;"
-                                           data-toggle="popover"
-                                           title="<?php echo $hesklang['feature_disabled']; ?>"
-                                           data-content="<?php echo $hesklang['multi_eml_disabled']; ?>"></i> <?php echo $hesklang['meml2']; ?>
-                                    </label>
-                                    <input type="hidden" name="s_multi_eml" value="0">
-                                    <?php
-                                } else {
-                                    ?>
-                                    <label><input type="checkbox" name="s_multi_eml"
-                                                  value="1" <?php if ($hesk_settings['multi_eml']) {
-                                            echo 'checked="checked"';
-                                        } ?>/> <?php echo $hesklang['meml2']; ?></label>
-                                    <?php
-                                }
-                                ?>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_confirm_email" class="col-sm-3 control-label"><?php echo $hesklang['sconfe']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#50','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_confirm_email"
-                                              value="1" <?php if ($hesk_settings['confirm_email']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['sconfe2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_open_only" class="col-sm-3 control-label"><?php echo $hesklang['oo']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#58','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-9">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_open_only"
-                                              value="1" <?php if ($hesk_settings['open_only']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['ool']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="html_emails" class="col-sm-3 col-xs-12 control-label">
-                            <span class="label label-primary"
-                                  data-toggle="tooltip"
-                                  title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['html_emails']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['html_emails']; ?>"
-                               data-content="<?php echo $hesklang['html_emails_help']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-9 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="html_emails" name="html_emails"
-                                           type="checkbox" <?php if ($modsForHesk_settings['html_emails']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['html_emails_text']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="email_attachments" class="col-sm-3 col-xs-12 control-label">
-                            <span class="label label-primary"
-                                  data-toggle="tooltip"
-                                  title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['email_attachments']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['email_attachments']; ?>"
-                               data-content="<?php echo $hesklang['email_attachments_help']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-9 col-xs-12">
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="email_attachments"
-                                           value="0" <?php echo $modsForHesk_settings['attachments'] == 0 ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['show_attachments_as_links']; ?>
-                                </label>
-                            </div>
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="email_attachments"
-                                           value="1" <?php echo $modsForHesk_settings['attachments'] == 1 ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['attach_directly_to_email']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Ticket List Tab -->
-                <div class="tab-pane fade in" id="ticket-list">
-                    <div class="form-group">
-                        <label for="s_open_only" class="col-sm-4 control-label"><?php echo $hesklang['fitl']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#1','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <?php
-                            // List available fields
-                            foreach ($hesk_settings['possible_ticket_list'] as $key => $title) {
-                                echo '
-                              <div class="checkbox">
-                                  <label><input type="checkbox" name="s_tl_' . $key . '" value="1" ' . (in_array($key, $hesk_settings['ticket_list']) ? 'checked="checked"' : '') . '/> ' . $title . '</label>
-                              </div>
-                              ';
-                            }
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="show_number_merged" class="col-sm-4 control-label">
-                          <span class="label label-primary"
-                                data-toggle="tooltip"
-                                title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['show_number_merged']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['show_number_merged']; ?>"
-                               data-content="<?php echo $hesklang['show_number_merged_help']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox"
-                                           name="show_number_merged" <?php if ($modsForHesk_settings['show_number_merged']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['show_number_merged_descr']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="blankSpace"></div>
-                    <div class="form-group">
-                        <label for="s_submittedformat" class="col-sm-4 control-label"><?php echo $hesklang['sdf']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#2','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $off = $hesk_settings['new_top'] ? '' : 'checked="checked"';
-                            echo '
-                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="2" ' . ($hesk_settings['submittedformat'] == 2 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf2'] . '</label></div><br>
-                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="1" ' . ($hesk_settings['submittedformat'] == 1 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf1'] . '</label></div><br>
-                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="0" ' . ($hesk_settings['submittedformat'] == 0 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf0'] . '</label></div>';
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_updatedformat" class="col-sm-4 control-label"><?php echo $hesklang['lcf']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#2','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8 form-inline">
-                            <?php
-
-                            echo '
-                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="2" ' . ($hesk_settings['updatedformat'] == 2 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf2'] . '</label></div><br>
-                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="1" ' . ($hesk_settings['updatedformat'] == 1 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf1'] . '</label></div><br>
-                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="0" ' . ($hesk_settings['updatedformat'] == 0 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf0'] . '</label></div>';
-                            ?>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Miscellaneous Tab -->
-                <div class="tab-pane fade in" id="misc">
-                    <h6 class="bold"><?php echo $hesklang['dat']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="servertime" class="col-sm-4 control-label"><?php echo $hesklang['server_time']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#18','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <p class="form-control-static"><?php echo $hesklang['csrt'] . ' <span id="servertime">' . $server_time . '</span>'; ?></p>
-                            <script language="javascript" type="text/javascript"><!--
-                                startTime();
-                                //-->
-                            </script>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col-sm-2 col-sm-offset-4">
-                                <input type="text" class="form-control" name="s_diff_hours" size="5" maxlength="3"
-                                       value="<?php echo $hesk_settings['diff_hours']; ?>"/>
-                            </div>
-                            <div class="col-sm-6 pad-right-0">
-                                <p class="form-control-static"><?php echo $hesklang['t_h']; ?></p>
-                            </div>
-                        </div>
-                        <div class="row pad-right-0">
-                            <div class="col-sm-2 col-sm-offset-4">
-                                <input type="text" class="form-control" name="s_diff_minutes" size="5" maxlength="3"
-                                       value="<?php echo $hesk_settings['diff_minutes']; ?>"/>
-                            </div>
-                            <div class="col-sm-6 pad-right-0">
-                                <p class="form-control-static"><?php echo $hesklang['t_m']; ?></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_daylight" class="col-sm-4 control-label"><?php echo $hesklang['day']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#19','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8 form-inline">
-                            <?php
-                            $on = $hesk_settings['daylight'] ? 'checked="checked"' : '';
-                            $off = $hesk_settings['daylight'] ? '' : 'checked="checked"';
-                            echo '
-                        <div class="radio"><label><input type="radio" name="s_daylight" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
-                        <div class="radio"><label><input type="radio" name="s_daylight" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
-                            ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_timeformat" class="col-sm-4 control-label"><?php echo $hesklang['tfor']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#20','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['tfor']); ?>" name="s_timeformat"
-                                   size="40" maxlength="255" value="<?php echo $hesk_settings['timeformat']; ?>"/>
-                        </div>
-                    </div>
-
-                    <h6 class="bold"><?php echo $hesklang['other']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <div class="form-group">
-                        <label for="s_ip_whois" class="col-sm-4 control-label"><?php echo $hesklang['ip_whois']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#61','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="s_ip_whois" size="40" maxlength="255"
-                                   value="<?php echo $hesk_settings['ip_whois']; ?>"/>
-                        </div>
-                    </div>
-                    <br>
-
-                    <div class="form-group">
-                        <label for="s_maintenance_mode" class="col-sm-4 control-label"><?php echo $hesklang['mms']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#62','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_maintenance_mode"
-                                              value="1" <?php if ($hesk_settings['maintenance_mode']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['mmd']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_alink" class="col-sm-4 control-label"><?php echo $hesklang['al']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#21','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_alink"
-                                              value="1" <?php if ($hesk_settings['alink']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['dap']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_submit_notice" class="col-sm-4 control-label"><?php echo $hesklang['subnot']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#48','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_submit_notice"
-                                              value="1" <?php if ($hesk_settings['submit_notice']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['subnot2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_online" class="col-sm-4 control-label"><?php echo $hesklang['sonline']; ?> <a
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#56','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-4">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_online"
-                                              value="1" <?php if ($hesk_settings['online']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['sonline2']; ?></label>
-                            </div>
-                        </div>
-                        <div class="col-sm-2 pad-right-0">
-                            <input type="text" class="form-control" name="s_online_min" size="5" maxlength="4"
-                                   value="<?php echo $hesk_settings['online_min']; ?>"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="rtl" class="col-sm-4 col-xs-12 control-label">
-                        <span class="label label-primary"
-                              data-toggle="tooltip"
-                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['displayRtl']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['displayRtl']; ?>"
-                               data-content="<?php echo $hesklang['displayRtlHelp']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="rtl" name="rtl" type="checkbox" <?php if ($modsForHesk_settings['rtl']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['display_rtl']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="show-icons" class="col-sm-4 col-xs-12 control-label">
-                        <span class="label label-primary"
-                              data-toggle="tooltip"
-                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['showIcons']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo $hesklang['showIcons']; ?>"
-                               data-content="<?php echo $hesklang['showIconsHelp']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="show-icons" name="show-icons"
-                                           type="checkbox" <?php if ($modsForHesk_settings['show_icons']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['show_icons_navigation']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="use_bootstrap_theme" class="col-sm-4 col-xs-12 control-label">
-                        <span class="label label-primary"
-                              data-toggle="tooltip"
-                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                            <?php echo $hesklang['use_bootstrap_theme']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
-                               title="<?php echo $hesklang['use_bootstrap_theme']; ?>"
-                               data-content="<?php echo $hesklang['use_bootstrap_theme_help']; ?>"></i>
-                        </label>
-
-                        <div class="col-sm-8 col-xs-12">
-                            <div class="checkbox">
-                                <label>
-                                    <input id="use_boostrap_theme" name="use_bootstrap_theme"
-                                           type="checkbox" <?php if ($modsForHesk_settings['use_bootstrap_theme']) {
-                                        echo 'checked';
-                                    } ?>> <?php echo $hesklang['use_bootstrap_theme']; ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="s_check_updates" class="col-sm-4 control-label"><?php echo $hesklang['updates']; ?>
-                            <a href="Javascript:void(0)"
-                               onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#59','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
-
-                        <div class="col-sm-8">
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="s_check_updates"
-                                              value="1" <?php if ($hesk_settings['check_updates']) {
-                                        echo 'checked="checked"';
-                                    } ?>/> <?php echo $hesklang['updates2']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- Mods For Hesk: Color settings -->
-                <div class="tab-pane fade in" id="colors">
-                    <h6 class="bold"><?php echo $hesklang['uiColors']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarBackgroundColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBackgroundColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarBackgroundColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarBackgroundColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarBackgroundColor" name="navbarBackgroundColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarBrandColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarBrandColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarBrandColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarBrandColor" name="navbarBrandColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarBrandColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarBrandHoverColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandHoverColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarBrandHoverColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarBrandHoverColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarBrandHoverColor" name="navbarBrandHoverColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarItemTextColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarItemTextColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarItemTextColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarItemTextColor" name="navbarItemTextColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarItemTextColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarItemTextHoverColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextHoverColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarItemTextHoverColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarItemTextHoverColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarItemTextHoverColor" name="navbarItemTextHoverColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarItemTextSelectedColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextSelectedColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarItemTextSelectedColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarItemTextSelectedColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarItemTextSelectedColor"
-                                           name="navbarItemTextSelectedColor" class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="navbarItemSelectedBackgroundColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>"
-                                       data-content="<?php echo $hesklang['navbarItemSelectedBackgroundColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="navbarItemSelectedBackgroundColor"
-                                           name="navbarItemSelectedBackgroundColor" class="form-control"
-                                           value="<?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="dropdownItemTextColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['dropdownItemTextColor']; ?>"
-                                       data-content="<?php echo $hesklang['dropdownItemTextColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="dropdownItemTextColor" name="dropdownItemTextColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="dropdownItemTextHoverColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['dropdownItemTextHoverColor']; ?>"
-                                       data-content="<?php echo $hesklang['dropdownItemTextHoverColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="dropdownItemTextHoverColor" name="dropdownItemTextHoverColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="questionMarkColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['questionMarkColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['questionMarkColor']; ?>"
-                                       data-content="<?php echo $hesklang['questionMarkColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="questionMarkColor" name="questionMarkColor"
-                                           class="form-control"
-                                           value="<?php echo $modsForHesk_settings['questionMarkColor']; ?>">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6 col-xs-12">
-                            <div class="form-group">
-                                <label for="dropdownItemTextHoverBackgroundColor"
-                                       class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       data-placement="left"
-                                       title="<?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>"
-                                       data-content="<?php echo $hesklang['dropdownItemTextHoverBackgroundColorHelp']; ?>"></i>
-                                </label>
-
-                                <div class="col-sm-5 col-xs-12">
-                                    <input type="text" id="dropdownItemTextHoverBackgroundColor"
-                                           name="dropdownItemTextHoverBackgroundColor" class="form-control"
-                                           value="<?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>">
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="col-sm-9 col-sm-offset-3">
-                        <br/>
-                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                    <label for="s_notify_closed"
+                           class="col-sm-3 control-label"><?php echo $hesklang['notclo']; ?></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_notify_closed"
+                                          value="1" <?php if ($hesk_settings['notify_closed']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['enable']; ?></label>
+                        </div>
+                    </div>
+                </div>
+
+                <h4 class="bold"><?php echo $hesklang['other']; ?></h4>
+                <div class="form-group">
+                    <label for="s_strip_quoted" class="col-sm-3 control-label"><?php echo $hesklang['remqr']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#61','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_strip_quoted"
+                                          value="1" <?php if ($hesk_settings['strip_quoted']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['remqr2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_eml_req_msg" class="col-sm-3 control-label"><?php echo $hesklang['emlreqmsg']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#66','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_eml_req_msg"
+                                          value="1" <?php if ($hesk_settings['eml_req_msg']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['emlreqmsg2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_save_embedded" class="col-sm-3 control-label"><?php echo $hesklang['embed']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#64','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_save_embedded"
+                                          value="1" <?php if ($hesk_settings['save_embedded']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['embed2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_multi_eml" class="col-sm-3 control-label"><?php echo $hesklang['meml']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#57','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <?php
+                            if ($modsForHesk_settings['customer_email_verification_required']) {
+                                ?>
+                                <label>
+                                    <i class="fa fa-ban bold red font-size-120" style="margin-left: -20px;"
+                                       data-toggle="popover"
+                                       title="<?php echo $hesklang['feature_disabled']; ?>"
+                                       data-content="<?php echo $hesklang['multi_eml_disabled']; ?>"></i> <?php echo $hesklang['meml2']; ?>
+                                </label>
+                                <input type="hidden" name="s_multi_eml" value="0">
+                                <?php
+                            } else {
+                                ?>
+                                <label><input type="checkbox" name="s_multi_eml"
+                                              value="1" <?php if ($hesk_settings['multi_eml']) {
+                                        echo 'checked="checked"';
+                                    } ?>/> <?php echo $hesklang['meml2']; ?></label>
+                                <?php
+                            }
+                            ?>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_confirm_email" class="col-sm-3 control-label"><?php echo $hesklang['sconfe']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#50','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_confirm_email"
+                                          value="1" <?php if ($hesk_settings['confirm_email']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['sconfe2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_open_only" class="col-sm-3 control-label"><?php echo $hesklang['oo']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#58','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-9">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_open_only"
+                                          value="1" <?php if ($hesk_settings['open_only']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['ool']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="html_emails" class="col-sm-3 col-xs-12 control-label">
+                            <span class="label label-primary"
+                                  data-toggle="tooltip"
+                                  title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['html_emails']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['html_emails']; ?>"
+                           data-content="<?php echo $hesklang['html_emails_help']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-9 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="html_emails" name="html_emails"
+                                       type="checkbox" <?php if ($modsForHesk_settings['html_emails']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['html_emails_text']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="email_attachments" class="col-sm-3 col-xs-12 control-label">
+                            <span class="label label-primary"
+                                  data-toggle="tooltip"
+                                  title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['email_attachments']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['email_attachments']; ?>"
+                           data-content="<?php echo $hesklang['email_attachments_help']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-9 col-xs-12">
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="email_attachments"
+                                       value="0" <?php echo $modsForHesk_settings['attachments'] == 0 ? 'checked' : ''; ?>>
+                                <?php echo $hesklang['show_attachments_as_links']; ?>
+                            </label>
+                        </div>
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="email_attachments"
+                                       value="1" <?php echo $modsForHesk_settings['attachments'] == 1 ? 'checked' : ''; ?>>
+                                <?php echo $hesklang['attach_directly_to_email']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Ticket List Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_7']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <div class="form-group">
+                    <label for="s_open_only" class="col-sm-4 control-label"><?php echo $hesklang['fitl']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#1','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
                         <?php
-                        if ($enable_save_settings) {
-                            echo '<input type="submit" id="submitbutton" value="' . $hesklang['save_changes'] . '" class="btn btn-default" />';
-                        } else {
-                            echo '<input type="button" value="' . $hesklang['save_changes'] . ' (' . $hesklang['disabled'] . ')" class="btn btn-default"  disabled="disabled" /><br /><font class="error">' . $hesklang['e_save_settings'] . '</font>';
+                        // List available fields
+                        foreach ($hesk_settings['possible_ticket_list'] as $key => $title) {
+                            echo '
+                              <div class="checkbox">
+                                  <label><input type="checkbox" name="s_tl_' . $key . '" value="1" ' . (in_array($key, $hesk_settings['ticket_list']) ? 'checked="checked"' : '') . '/> ' . $title . '</label>
+                              </div>
+                              ';
                         }
                         ?>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="show_number_merged" class="col-sm-4 control-label">
+                          <span class="label label-primary"
+                                data-toggle="tooltip"
+                                title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['show_number_merged']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['show_number_merged']; ?>"
+                           data-content="<?php echo $hesklang['show_number_merged_help']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox"
+                                       name="show_number_merged" <?php if ($modsForHesk_settings['show_number_merged']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['show_number_merged_descr']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_submittedformat" class="col-sm-4 control-label"><?php echo $hesklang['sdf']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#2','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $off = $hesk_settings['new_top'] ? '' : 'checked="checked"';
+                        echo '
+                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="2" ' . ($hesk_settings['submittedformat'] == 2 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf2'] . '</label></div><br>
+                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="1" ' . ($hesk_settings['submittedformat'] == 1 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf1'] . '</label></div><br>
+                            <div class="radio"><label><input type="radio" name="s_submittedformat" value="0" ' . ($hesk_settings['submittedformat'] == 0 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf0'] . '</label></div>';
+                        ?>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_updatedformat" class="col-sm-4 control-label"><?php echo $hesklang['lcf']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>ticket_list.html#2','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8 form-inline">
+                        <?php
+
+                        echo '
+                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="2" ' . ($hesk_settings['updatedformat'] == 2 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf2'] . '</label></div><br>
+                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="1" ' . ($hesk_settings['updatedformat'] == 1 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf1'] . '</label></div><br>
+                          <div class="radio"><label><input type="radio" name="s_updatedformat" value="0" ' . ($hesk_settings['updatedformat'] == 0 ? 'checked="checked"' : '') . ' /> ' . $hesklang['lcf0'] . '</label></div>';
+                        ?>
+                    </div>
+                </div>
             </div>
-        </form>
-    </div>
+        </div>
+
+        <!-- Misc Settings -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['tab_5']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['dat']; ?></h4>
+                <div class="form-group">
+                    <label for="servertime" class="col-sm-4 control-label"><?php echo $hesklang['server_time']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#18','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <p class="form-control-static"><?php echo $hesklang['csrt'] . ' <span id="servertime">' . $server_time . '</span>'; ?></p>
+                        <script language="javascript" type="text/javascript"><!--
+                            startTime();
+                            //-->
+                        </script>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="row">
+                        <div class="col-sm-2 col-sm-offset-4">
+                            <input type="text" class="form-control" name="s_diff_hours" size="5" maxlength="3"
+                                   value="<?php echo $hesk_settings['diff_hours']; ?>"/>
+                        </div>
+                        <div class="col-sm-6 pad-right-0">
+                            <p class="form-control-static"><?php echo $hesklang['t_h']; ?></p>
+                        </div>
+                    </div>
+                    <div class="row pad-right-0">
+                        <div class="col-sm-2 col-sm-offset-4">
+                            <input type="text" class="form-control" name="s_diff_minutes" size="5" maxlength="3"
+                                   value="<?php echo $hesk_settings['diff_minutes']; ?>"/>
+                        </div>
+                        <div class="col-sm-6 pad-right-0">
+                            <p class="form-control-static"><?php echo $hesklang['t_m']; ?></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_daylight" class="col-sm-4 control-label"><?php echo $hesklang['day']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#19','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8 form-inline">
+                        <?php
+                        $on = $hesk_settings['daylight'] ? 'checked="checked"' : '';
+                        $off = $hesk_settings['daylight'] ? '' : 'checked="checked"';
+                        echo '
+                        <div class="radio"><label><input type="radio" name="s_daylight" value="0" ' . $off . ' /> ' . $hesklang['off'] . '</label></div>&nbsp;&nbsp;&nbsp;
+                        <div class="radio"><label><input type="radio" name="s_daylight" value="1" ' . $on . ' /> ' . $hesklang['on'] . '</label></div>';
+                        ?>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_timeformat" class="col-sm-4 control-label"><?php echo $hesklang['tfor']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#20','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['tfor']); ?>" name="s_timeformat"
+                               size="40" maxlength="255" value="<?php echo $hesk_settings['timeformat']; ?>"/>
+                    </div>
+                </div>
+
+                <h4 class="bold"><?php echo $hesklang['other']; ?></h4>
+                <div class="form-group">
+                    <label for="s_ip_whois" class="col-sm-4 control-label"><?php echo $hesklang['ip_whois']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#61','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control" name="s_ip_whois" size="40" maxlength="255"
+                               value="<?php echo $hesk_settings['ip_whois']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_maintenance_mode" class="col-sm-4 control-label"><?php echo $hesklang['mms']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#62','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_maintenance_mode"
+                                          value="1" <?php if ($hesk_settings['maintenance_mode']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['mmd']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_alink" class="col-sm-4 control-label"><?php echo $hesklang['al']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#21','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_alink"
+                                          value="1" <?php if ($hesk_settings['alink']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['dap']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_submit_notice" class="col-sm-4 control-label"><?php echo $hesklang['subnot']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#48','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_submit_notice"
+                                          value="1" <?php if ($hesk_settings['submit_notice']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['subnot2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_online" class="col-sm-4 control-label"><?php echo $hesklang['sonline']; ?> <a
+                            href="Javascript:void(0)"
+                            onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#56','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-4">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_online"
+                                          value="1" <?php if ($hesk_settings['online']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['sonline2']; ?></label>
+                        </div>
+                    </div>
+                    <div class="col-sm-2 pad-right-0">
+                        <input type="text" class="form-control" name="s_online_min" size="5" maxlength="4"
+                               value="<?php echo $hesk_settings['online_min']; ?>"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="rtl" class="col-sm-4 col-xs-12 control-label">
+                        <span class="label label-primary"
+                              data-toggle="tooltip"
+                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['displayRtl']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['displayRtl']; ?>"
+                           data-content="<?php echo $hesklang['displayRtlHelp']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="rtl" name="rtl" type="checkbox" <?php if ($modsForHesk_settings['rtl']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['display_rtl']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="show-icons" class="col-sm-4 col-xs-12 control-label">
+                        <span class="label label-primary"
+                              data-toggle="tooltip"
+                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['showIcons']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo $hesklang['showIcons']; ?>"
+                           data-content="<?php echo $hesklang['showIconsHelp']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="show-icons" name="show-icons"
+                                       type="checkbox" <?php if ($modsForHesk_settings['show_icons']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['show_icons_navigation']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="use_bootstrap_theme" class="col-sm-4 col-xs-12 control-label">
+                        <span class="label label-primary"
+                              data-toggle="tooltip"
+                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                        <?php echo $hesklang['use_bootstrap_theme']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo $hesklang['use_bootstrap_theme']; ?>"
+                           data-content="<?php echo $hesklang['use_bootstrap_theme_help']; ?>"></i>
+                    </label>
+
+                    <div class="col-sm-8 col-xs-12">
+                        <div class="checkbox">
+                            <label>
+                                <input id="use_boostrap_theme" name="use_bootstrap_theme"
+                                       type="checkbox" <?php if ($modsForHesk_settings['use_bootstrap_theme']) {
+                                    echo 'checked';
+                                } ?>> <?php echo $hesklang['use_bootstrap_theme']; ?>
+                            </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="s_check_updates" class="col-sm-4 control-label"><?php echo $hesklang['updates']; ?>
+                        <a href="Javascript:void(0)"
+                           onclick="Javascript:hesk_window('<?php echo $help_folder; ?>misc.html#59','400','500')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i></a></label>
+
+                    <div class="col-sm-8">
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="s_check_updates"
+                                          value="1" <?php if ($hesk_settings['check_updates']) {
+                                    echo 'checked="checked"';
+                                } ?>/> <?php echo $hesklang['updates2']; ?></label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- UI Colors -->
+        <div class="box collapsed-box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['uiColors']; ?>
+                    <span class="label label-primary" data-toggle="tooltip"
+                          title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>">
+                        <?php echo $hesklang['mods_for_hesk_acronym']; ?>
+                    </span>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <h4 class="bold"><?php echo $hesklang['uiColors']; ?></h4>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarBackgroundColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBackgroundColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarBackgroundColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarBackgroundColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarBackgroundColor" name="navbarBackgroundColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarBrandColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarBrandColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarBrandColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarBrandColor" name="navbarBrandColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarBrandColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarBrandHoverColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandHoverColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarBrandHoverColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarBrandHoverColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarBrandHoverColor" name="navbarBrandHoverColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarItemTextColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarItemTextColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarItemTextColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarItemTextColor" name="navbarItemTextColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarItemTextColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarItemTextHoverColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextHoverColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarItemTextHoverColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarItemTextHoverColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarItemTextHoverColor" name="navbarItemTextHoverColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarItemTextSelectedColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextSelectedColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarItemTextSelectedColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarItemTextSelectedColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarItemTextSelectedColor"
+                                       name="navbarItemTextSelectedColor" class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="navbarItemSelectedBackgroundColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>"
+                                   data-content="<?php echo $hesklang['navbarItemSelectedBackgroundColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="navbarItemSelectedBackgroundColor"
+                                       name="navbarItemSelectedBackgroundColor" class="form-control"
+                                       value="<?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="dropdownItemTextColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['dropdownItemTextColor']; ?>"
+                                   data-content="<?php echo $hesklang['dropdownItemTextColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="dropdownItemTextColor" name="dropdownItemTextColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="dropdownItemTextHoverColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['dropdownItemTextHoverColor']; ?>"
+                                   data-content="<?php echo $hesklang['dropdownItemTextHoverColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="dropdownItemTextHoverColor" name="dropdownItemTextHoverColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="questionMarkColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['questionMarkColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['questionMarkColor']; ?>"
+                                   data-content="<?php echo $hesklang['questionMarkColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="questionMarkColor" name="questionMarkColor"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['questionMarkColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="dropdownItemTextHoverBackgroundColor"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>"
+                                   data-content="<?php echo $hesklang['dropdownItemTextHoverBackgroundColorHelp']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="dropdownItemTextHoverBackgroundColor"
+                                       name="dropdownItemTextHoverBackgroundColor" class="form-control"
+                                       value="<?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="form-group" style="margin-left: 10px">
+            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+            <?php
+            if ($enable_save_settings) {
+                echo '<input type="submit" id="submitbutton" value="' . $hesklang['save_changes'] . '" class="btn btn-default" />';
+            } else {
+                echo '<input type="button" value="' . $hesklang['save_changes'] . ' (' . $hesklang['disabled'] . ')" class="btn btn-default"  disabled="disabled" /><br /><font class="error">' . $hesklang['e_save_settings'] . '</font>';
+            }
+            ?>
+        </div>
+    </form>
+</section>
 
     <?php
     require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 7f79447d..fb6f0698 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -41,6 +41,7 @@ require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
 require(HESK_PATH . 'inc/view_attachment_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -624,523 +625,370 @@ if ($ticket['email'] != '') {
     }
 }
 
+// TODO Here we go!
 /* Print admin navigation */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-<div class="row" style="padding: 20px">
-    <div class="col-md-2">
-        <div class="panel panel-default">
-            <div class="panel-heading"><?php echo $hesklang['information']; ?></div>
-            <ul class="list-group">
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['trackID']; ?></strong><br/>
-                    <?php
+<section class="content">
+    <?php
+    /* This will handle error, success and notice messages */
+    hesk_handle_messages();
+    ?>
+    <h1><?php echo $hesklang['ticket_details']; ?></h1>
+    <h2>
+        <?php
 
-                    $tmp = '';
-                    if ($hesk_settings['sequential']) {
-                        $tmp = ' (' . $hesklang['seqid'] . ': ' . $ticket['id'] . ')';
-                    }
+        $tmp = '';
+        if ($hesk_settings['sequential']) {
+            $tmp = ' (' . $hesklang['seqid'] . ': ' . $ticket['id'] . ')';
+        }
 
-                    echo $trackingID . '<br/>' . $tmp; ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['lgs']; ?></strong><br>
-                    <?php echo $ticket['language'] !== NULL ? $ticket['language'] : HESK_DEFAULT_LANGUAGE; ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['replies']; ?></strong><br/>
-                    <?php echo $ticket['replies']; ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['owner']; ?></strong><br/>
-                    <?php
-                    echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] :
-                        ($can_assign_self ? $hesklang['unas'] . ' — <a href="assign_owner.php?track=' . $trackingID . '&amp;owner=' . $_SESSION['id'] . '&amp;token=' . hesk_token_echo(0) . '">' . $hesklang['asss'] . '</a>' : $hesklang['unas']);
-                    ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['created_on']; ?></strong><br>
-                    <?php echo hesk_date($ticket['dt'], true); ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['last_update']; ?></strong><br>
-                    <?php echo hesk_date($ticket['lastchange'], true); ?>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['due_date']; ?></strong><br>
-                    <div id="readonly-due-date">
-                        <span id="due-date">
-                        <?php
-                            $due_date = $hesklang['none'];
-                            if ($ticket['due_date'] != null) {
-                                $due_date = hesk_date($ticket['due_date'], false, true, false);
-                                $due_date = date('Y-m-d', $due_date);
-                            }
-                            echo $due_date;
-                        ?></span><!--<span id="overdue">
-                        <?php
-                        /*if ($due_date < $current_date) {
-                            echo ' <i class="fa fa-exclamation-triangle dark-orange" data-toggle="tooltip" title="Ticket overdue!"></i>';
-                        }*/
-                        ?>
-                        </span>-->
-                        <br>
-                        <button id="due-date-button" class="btn btn-default btn-sm"><?php echo $hesklang['chg']; ?></button>
-                    </div>
-                    <div id="editable-due-date" style="display: none">
-                        <div class="form-group">
-                            <input type="text" class="form-control datepicker" name="due-date" value="<?php echo $due_date == $hesklang['none'] ? '' : $due_date; ?>">
-                            <p class="help-block"><?php echo $hesklang['clear_for_no_due_date']; ?></p>
-                        </div>
-                        <div class="btn-group">
-                            <button id="submit" class="btn btn-primary"><?php echo $hesklang['save']; ?></button>
-                            <button id="cancel" class="btn btn-default"><?php echo $hesklang['cancel']; ?></button>
-                        </div>
-                    </div>
-                </li>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['last_replier']; ?></strong><br>
-                    <?php echo $ticket['repliername']; ?>
-                </li>
+        echo $trackingID . $tmp; ?>
+    </h2>
+    <div class="box">
+        <div class="box-header">
+            <h1 class="box-title">
+                <i class="fa fa-user"></i>
                 <?php
-                if ($hesk_settings['time_worked']) {
-                    ?>
-                    <li class="list-group-item">
-                        <strong><?php echo $hesklang['ts']; ?></strong><br/>
-                        <?php
-                        if ($can_reply || $can_edit)
-                        {
-                        ?>
-                        <a href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('modifytime')"><?php echo $ticket['time_worked']; ?></a>
+                echo $ticket['name'];
+                if ($ticket['archive']) {
+                    echo ' <span class="label label-primary"><i class="fa fa-tag"></i> ' . $hesklang['archived'] . '</span>';
+                }
+                if ($ticket['locked']) {
+                    echo ' <span class="label label-primary"><i class="fa fa-lock"></i> ' . $hesklang['loc'] . '</span>';
+                }
+                ?>
+            </h1>
+            <div class="pull-right">
+                <?php echo hesk_getAdminButtons($category['id']); ?>
+            </div>
+        </div>
+        <div class="box-body">
+            <div class="callout callout-info">
+                <div class="row">
+                    <div class="col-md-3">
+                        <strong><?php echo $hesklang['created_colon']; ?></strong>
+                        <?php echo hesk_date($ticket['dt'], true); ?>
+                    </div>
+                    <div class="col-md-3">
+                        <strong><?php echo $hesklang['updated_colon']; ?></strong>
+                        <?php echo hesk_date($ticket['lastchange'], true); ?>
+                    </div>
+                    <?php if ($ticket['language'] !== NULL): ?>
+                    <div class="col-md-3">
+                        <strong><?php echo $hesklang['language_colon']; ?></strong>
+                        <?php echo $ticket['language']; ?>
+                    </div>
+                    <div class="col-md-3">
+                        <strong><?php echo $hesklang['last_replier_colon']; ?></strong>
+                        <?php echo $ticket['repliername']; ?>
+                    </div>
+                    <?php endif; ?>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <table class="table table-striped">
+                        <tbody>
+                        <?php if ($ticket['email'] !== ''): ?>
+                        <tr>
+                            <td><b><?php echo $hesklang['email']; ?></b></td>
+                            <td>
+                                <a href="mailto:<?php echo $ticket['email']; ?>"><?php echo $ticket['email']; ?></a>
+                                <?php
+                                if ($can_ban_emails && !empty($ticket['email'])) {
+                                    if ($email_id = hesk_isBannedEmail($ticket['email'])) {
+                                        if ($can_unban_emails) {
+                                            echo '<a href="banned_emails.php?a=unban&amp;track=' . $trackingID . '&amp;id=' . intval($email_id) . '&amp;token=' . hesk_token_echo(0) . '">
+                                        <i class="fa fa-ban icon-link red gray-on-hover" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['eisban'] . ' ' . $hesklang['click_unban'] . '"></i>
+                                    </a> ';
+                                        } else {
+                                            echo '<i class="fa fa-ban icon-link red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['eisban'] . '"></i>';
+                                        }
+                                    } else {
+                                        echo '<a href="banned_emails.php?a=ban&amp;track=' . $trackingID . '&amp;email=' . urlencode($ticket['email']) . '&amp;token=' . hesk_token_echo(0) . '">
+                                    <i class="fa fa-ban icon-link gray red-on-hover" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['savebanemail'] . '"></i>
+                                </a> ';
+                                    }
+                                }
+                                ?>
+                            </td>
+                        </tr>
+                        <?php endif; if ($hesk_settings['time_worked']): ?>
+                        <tr>
+                            <td><strong><?php echo $hesklang['ip']; ?></strong></td>
+                            <td>
+                                <?php
 
-                            <?php $t = hesk_getHHMMSS($ticket['time_worked']); ?>
+                                // Format IP for lookup
+                                if ($ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
+                                    echo $hesklang['unknown'];
+                                } else {
+                                    echo '<a href="../ip_whois.php?ip=' . urlencode($ticket['ip']) . '">' . $ticket['ip'] . '</a>';
 
-                            <div id="modifytime" style="display:none">
-                                <br />
+                                    if ($can_ban_ips) {
+                                        if ($ip_id = hesk_isBannedIP($ticket['ip'])) {
+                                            if ($can_unban_ips) {
+                                                echo '<a href="banned_ips.php?a=unban&amp;track=' . $trackingID . '&amp;id=' . intval($ip_id) . '&amp;token=' . hesk_token_echo(0) . '">
+                                            <i class="fa fa-ban red icon-link gray-on-hover" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['ipisban'] . ' ' . $hesklang['click_unban'] . '"></i>
+                                        </a> ';
+                                            } else {
+                                                echo '<i class="fa fa-ban icon-link red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['ipisban'] . '"></i>';
+                                            }
+                                        } else {
+                                            echo '<a href="banned_ips.php?a=ban&amp;track=' . $trackingID . '&amp;ip=' . urlencode($ticket['ip']) . '&amp;token=' . hesk_token_echo(0) . '">
+                                        <i class="fa fa-ban gray icon-link red-on-hover" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['savebanip'] . '"></i>
+                                    </a> ';
+                                        }
+                                    }
+                                }
+                                ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><b><?php echo $hesklang['ts']; ?></b></td>
+                            <td>
+                                <span class="click-to-edit" onclick="Javascript:hesk_toggleLayerDisplay('modifytime')"
+                                    data-toggle="tooltip" title="<?php echo $hesklang['click_to_edit']; ?>">
+                                    <?php echo $ticket['time_worked']; ?>
+                                </span>
+                            <?php
+                            if ($can_reply || $can_edit)
+                            {
+                                ?><?php $t = hesk_getHHMMSS($ticket['time_worked']); ?>
 
-                                <form data-toggle="validator" class="form-horizontal" method="post" action="admin_ticket.php" style="margin:0px; padding:0px;">
-                                    <div class="form-group">
-                                        <label for="h" class="col-sm-4 control-label"><?php echo $hesklang['hh']; ?></label>
-                                        <div class="col-sm-8">
-                                            <input type="text" name="h" value="<?php echo $t[0]; ?>" size="3"
-                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                            placeholder="<?php echo htmlspecialchars($hesklang['hh']); ?>"
-                                            class="form-control input-sm" required>
+                                <div id="modifytime" style="display:none">
+                                    <form data-toggle="validator" class="form-horizontal" method="post" action="admin_ticket.php" style="margin:0px; padding:0px;">
+                                        <div class="form-group">
+                                            <label for="h" class="col-sm-4 control-label"><?php echo $hesklang['hh']; ?></label>
+                                            <div class="col-sm-8">
+                                                <input type="text" name="h" value="<?php echo $t[0]; ?>" size="3"
+                                                       data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                                       placeholder="<?php echo htmlspecialchars($hesklang['hh']); ?>"
+                                                       class="form-control input-sm" required>
+                                            </div>
+                                            <div class="col-sm-12 text-right">
+                                                <div class="help-block with-errors"></div>
+                                            </div>
                                         </div>
-                                        <div class="col-sm-12 text-right">
-                                            <div class="help-block with-errors"></div>
+                                        <div class="form-group input-group-sm">
+                                            <label for="m" class="col-sm-4 control-label"><?php echo $hesklang['mm']; ?></label>
+                                            <div class="col-sm-8">
+                                                <input type="text" name="m" value="<?php echo $t[1]; ?>" size="3"
+                                                       data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                                       placeholder="<?php echo htmlspecialchars($hesklang['mm']); ?>"
+                                                       class="form-control input-sm" required>
+                                            </div>
+                                            <div class="col-sm-12 text-right">
+                                                <div class="help-block with-errors"></div>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group input-group-sm">
-                                        <label for="m" class="col-sm-4 control-label"><?php echo $hesklang['mm']; ?></label>
-                                        <div class="col-sm-8">
-                                            <input type="text" name="m" value="<?php echo $t[1]; ?>" size="3"
-                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                            placeholder="<?php echo htmlspecialchars($hesklang['mm']); ?>"
-                                            class="form-control input-sm" required>
+                                        <div class="form-group input-group-sm">
+                                            <label for="s" class="col-sm-4 control-label"><?php echo $hesklang['ss']; ?></label>
+                                            <div class="col-sm-8">
+                                                <input type="text" name="s" value="<?php echo $t[2]; ?>" size="3"
+                                                       data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                                       placeholder="<?php echo htmlspecialchars($hesklang['ss']); ?>"
+                                                       class="form-control input-sm" required>
+                                            </div>
+                                            <div class="col-sm-12 text-right">
+                                                <div class="help-block with-errors"></div>
+                                            </div>
                                         </div>
-                                        <div class="col-sm-12 text-right">
-                                            <div class="help-block with-errors"></div>
+                                        <div class="text-right">
+                                            <div class="btn-group btn-group-sm text-right">
+                                                <input class="btn btn-primary" type="submit" value="<?php echo $hesklang['save']; ?>" />
+                                                <a class="btn btn-default" href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('modifytime')"><?php echo $hesklang['cancel']; ?></a>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="form-group input-group-sm">
-                                        <label for="s" class="col-sm-4 control-label"><?php echo $hesklang['ss']; ?></label>
-                                        <div class="col-sm-8">
-                                            <input type="text" name="s" value="<?php echo $t[2]; ?>" size="3"
-                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                            placeholder="<?php echo htmlspecialchars($hesklang['ss']); ?>"
-                                            class="form-control input-sm" required>
-                                        </div>
-                                        <div class="col-sm-12 text-right">
-                                            <div class="help-block with-errors"></div>
-                                        </div>
-                                    </div>
-                                    <div class="text-right">
-                                        <div class="btn-group btn-group-sm text-right">
-                                            <input class="btn btn-primary" type="submit" value="<?php echo $hesklang['save']; ?>" />
-                                            <a class="btn btn-default" href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('modifytime')"><?php echo $hesklang['cancel']; ?></a>
-                                        </div>
-                                    </div>
-                                    <input type="hidden" name="track" value="<?php echo $trackingID; ?>" />
-                                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
-                                </form>
-                            </div>
-
-                        </td>
-                        <?php
-                        }
-                        else
-                        {
-                            echo $ticket['time_worked'];
-                        }
-                        ?>
-                    </li>
-                <?php } // End if time_worked ?>
-                <li class="list-group-item">
-                    <strong><?php echo $hesklang['linked_tickets']; ?></strong>
-
-                    <p><?php
-                        if ($ticket['parent'] != null) {
-                            //-- Get the tracking ID of the parent
-                            $parentRs = hesk_dbQuery('SELECT `trackid` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets`
+                                        <input type="hidden" name="track" value="<?php echo $trackingID; ?>" />
+                                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
+                                    </form>
+                                </div>
+                                <?php
+                            }
+                            ?>
+                            </td>
+                        </tr>
+                        <?php endif; ?>
+                        <tr>
+                            <td><strong><?php echo $hesklang['linked_tickets']; ?></strong></td>
+                            <td>
+                                <?php
+                                if ($ticket['parent'] != null) {
+                                    //-- Get the tracking ID of the parent
+                                    $parentRs = hesk_dbQuery('SELECT `trackid` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets`
                                 WHERE `ID` = ' . hesk_dbEscape($ticket['parent']));
-                            $parent = hesk_dbFetchAssoc($parentRs);
-                            echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteParent=true">
+                                    $parent = hesk_dbFetchAssoc($parentRs);
+                                    echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteParent=true">
                                 <i class="fa fa-times-circle" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete_relationship'] . '"></i></a>';
-                            echo '&nbsp;<a href="admin_ticket.php?track=' . $parent['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $parent['trackid'] . '</a>';
-                        }
-                        //-- Check if any tickets have a parent set to this tracking ID
-                        $hasRows = false;
-                        $childrenRS = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets`
+                                    echo '&nbsp;<a href="admin_ticket.php?track=' . $parent['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $parent['trackid'] . '</a>';
+                                }
+                                //-- Check if any tickets have a parent set to this tracking ID
+                                $hasRows = false;
+                                $childrenRS = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets`
                         WHERE `parent` = ' . hesk_dbEscape($ticket['id']));
-                        while ($row = hesk_dbFetchAssoc($childrenRS)) {
-                            $hasRows = true;
-                            echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteChild=' . $row['id'] . '">
+                                while ($row = hesk_dbFetchAssoc($childrenRS)) {
+                                    $hasRows = true;
+                                    echo '<a href="admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999) . '&deleteChild=' . $row['id'] . '">
                             <i class="fa fa-times-circle font-icon red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['unlink'] . '"></i></a>';
-                            echo '&nbsp;<a href="admin_ticket.php?track=' . $row['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $row['trackid'] . '</a>';
-                            echo '<br>';
-                        }
-                        if (!$hasRows && $ticket['parent'] == null) {
-                            echo $hesklang['none'];
-                        }
-                        ?></p>
-                    <?php
-                    if ($can_reply || $can_edit) {
-                        ?>
-                        <div id="addChildText">
-                            <p><?php echo '<a class="btn btn-default btn-sm" href="javascript:void(0)" onclick="toggleChildrenForm(true)">' . $hesklang['add_ticket'] . '</a>'; ?></p>
-                        </div>
-                        <div id="childrenForm" style="display: none">
-                            <form action="admin_ticket.php" method="post" data-toggle="validator">
-                                <div class="form-group">
-                                    <label for="childTrackingId" class="control-label">
-                                        <?php echo $hesklang['trackID']; ?>
-                                    </label>
-                                    <input type="text" name="childTrackingId" class="form-control input-sm"
-                                           placeholder="<?php echo htmlspecialchars($hesklang['trackID']); ?>"
-                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                           required>
-                                    <div class="help-block with-errors"></div>
+                                    echo '&nbsp;<a href="admin_ticket.php?track=' . $row['trackid'] . '&Refresh=' . mt_rand(10000, 99999) . '">' . $row['trackid'] . '</a>';
+                                    echo '<br>';
+                                }
+                                if (!$hasRows && $ticket['parent'] == null) {
+                                    echo $hesklang['none'];
+                                }
+
+                                if ($can_reply || $can_edit) {
+                                    ?>
+                                    <div id="addChildText">
+                                        <?php echo '<a href="javascript:void(0)" onclick="toggleChildrenForm(true)"><i class="fa fa-plus-circle"></i> ' . $hesklang['add_ticket'] . '</a>'; ?>
+                                    </div>
+                                    <div id="childrenForm" style="display: none">
+                                        <form action="admin_ticket.php" method="post" data-toggle="validator">
+                                            <div class="form-group">
+                                                <label for="childTrackingId" class="control-label">
+                                                    <?php echo $hesklang['trackID']; ?>
+                                                </label>
+                                                <input type="text" name="childTrackingId" class="form-control input-sm"
+                                                       placeholder="<?php echo htmlspecialchars($hesklang['trackID']); ?>"
+                                                       data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                                       required>
+                                                <div class="help-block with-errors"></div>
+                                            </div>
+                                            <div class="btn-group">
+                                                <input type="submit" class="btn btn-primary btn-sm"
+                                                       value="<?php echo $hesklang['save']; ?>">
+                                                <a class="btn btn-default btn-sm" href="javascript:void(0)"
+                                                   onclick="toggleChildrenForm(false)">
+                                                    <?php echo $hesklang['cancel']; ?>
+                                                </a>
+                                            </div>
+                                            <input type="hidden" name="track" value="<?php echo $trackingID; ?>"/>
+                                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                                        </form>
+                                    </div>
+                                <?php } ?>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div class="col-md-6">
+                    <table class="table table-striped">
+                        <tbody>
+                        <tr>
+                            <td><strong><?php echo $hesklang['due_date']; ?></strong></td>
+                            <td>
+                                <div id="readonly-due-date">
+                                    <span id="due-date" data-toggle="tooltip" title="<?php echo $hesklang['click_to_edit']; ?>">
+                                    <?php
+                                    $due_date = $hesklang['none'];
+                                    if ($ticket['due_date'] != null) {
+                                        $due_date = hesk_date($ticket['due_date'], false, true, false);
+                                        $due_date = date('Y-m-d', $due_date);
+                                    }
+                                    echo $due_date;
+                                    ?></span>
                                 </div>
-                                <div class="btn-group">
-                                    <input type="submit" class="btn btn-primary btn-sm"
-                                           value="<?php echo $hesklang['save']; ?>">
-                                    <a class="btn btn-default btn-sm" href="javascript:void(0)"
-                                       onclick="toggleChildrenForm(false)">
-                                        <?php echo $hesklang['cancel']; ?>
-                                    </a>
+                                <div id="editable-due-date" style="display: none">
+                                    <div class="form-group">
+                                        <input title="due-date" type="text" class="form-control datepicker" name="due-date" value="<?php echo $due_date == $hesklang['none'] ? '' : $due_date; ?>">
+                                        <p class="help-block"><?php echo $hesklang['clear_for_no_due_date']; ?></p>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button id="submit" class="btn btn-primary"><?php echo $hesklang['save']; ?></button>
+                                        <button id="cancel" class="btn btn-default"><?php echo $hesklang['cancel']; ?></button>
+                                    </div>
                                 </div>
-                                <input type="hidden" name="track" value="<?php echo $trackingID; ?>"/>
-                                <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                            </form>
-                        </div>
-                    <?php } ?>
-                </li>
-                <?php if ($recentTickets !== NULL): ?>
-                    <li class="list-group-item">
-                        <strong><?php echo $hesklang['recent_tickets']; ?></strong>
-                        <?php foreach ($recentTickets as $recentTicket): ?>
-                            <p style="margin: 0">
-                                <i class="fa fa-circle" data-toggle="tooltip" data-placement="top"
-                                   style="color: <?php echo $recentTicket['statusColor']; ?>"
-                                   title="<?php echo sprintf($hesklang['current_status_colon'], $recentTicket['statusText']); ?>"></i>
-                                <?php echo '<a href="admin_ticket.php?track=' . $recentTicket['trackid'] . '&amp;Refresh=' . mt_rand(10000, 99999) . '">' . $recentTicket['trackid'] . '</a>'; ?>
-                            </p>
-                        <?php endforeach; ?>
-                    </li>
-                <?php endif; ?>
-            </ul>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td><strong><?php echo $hesklang['replies']; ?></strong></td>
+                            <td><?php echo $ticket['replies']; ?></td>
+                        </tr>
+                        <tr>
+                            <td><strong><?php echo $hesklang['recent_tickets']; ?></strong></td>
+                            <td>
+                                <?php if ($recentTickets === NULL): ?>
+                                    <p style="margin: 0"><?php echo $hesklang['none']; ?></p>
+                                <?php
+                                else:
+                                    foreach ($recentTickets as $recentTicket):
+                                ?>
+                                    <p style="margin: 0">
+                                        <i class="fa fa-circle" data-toggle="tooltip" data-placement="top"
+                                           style="color: <?php echo $recentTicket['statusColor']; ?>"
+                                           title="<?php echo sprintf($hesklang['current_status_colon'], $recentTicket['statusText']); ?>"></i>
+                                        <?php echo '<a href="admin_ticket.php?track=' . $recentTicket['trackid'] . '&amp;Refresh=' . mt_rand(10000, 99999) . '">' . $recentTicket['trackid'] . '</a>'; ?>
+                                    </p>
+                                <?php
+                                    endforeach;
+                                endif;
+                                ?>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
         </div>
     </div>
-    <div class="col-md-10">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
+    <div class="table-bordered status-row">
+        <div class="row no-margins med-low-priority">
+            <?php
 
-        /* Do we need or have any canned responses? */
-        $can_options = hesk_printCanned();
+            $priorityLanguages = array(
+                0 => $hesklang['critical'],
+                1 => $hesklang['high'],
+                2 => $hesklang['medium'],
+                3 => $hesklang['low']
+            );
+            $options = array();
+            for ($i = 0; $i < 4; $i++) {
+                $selected = $ticket['priority'] == $i ? 'selected' : '';
+                array_push($options, '<option value="' . $i . '" ' . $selected . '>' . $priorityLanguages[$i] . '</option>');
+            }
 
-        echo hesk_getAdminButtons();
-        ?>
-        <div class="blankSpace"></div>
-        <!-- BEGIN TICKET HEAD -->
-        <div class="table-bordered">
-            <div class="row">
-                <div class="col-md-12">
-                    <h3>
-                        <?php
-                        if ($ticket['archive']) {
-                            echo '<span class="fa fa-tag"></span> &nbsp;';
-                        }
-                        if ($ticket['locked']) {
-                            echo '<span class="fa fa-lock"></span>&nbsp;';
-                        }
-                        if ($modsForHesk_settings['display_user_agent_information']
-                            && $ticket['user_agent'] !== NULL
-                            && $ticket['screen_resolution_height'] !== NULL
-                            && $ticket['screen_resolution_height'] != 0
-                            && $ticket['screen_resolution_width'] !== NULL
-                            && $ticket['screen_resolution_width'] != 0
-                        ):
-                            ?>
-                            <span data-toggle="modal" data-target="#user-agent-modal" style="cursor: pointer">
-                                <i class="fa fa-desktop" data-toggle="tooltip"
-                                   title="<?php echo htmlspecialchars($hesklang['click_for_device_information']); ?>"></i>
-                            </span>
-                            <div id="user-agent-modal" class="modal fade" tabindex="-1" role="dialog"
-                                 aria-hidden="true">
-                                <div class="modal-dialog modal-lg">
-                                    <div class="modal-content">
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                                <span aria-hidden="true">&times;</span>
-                                            </button>
-                                            <h4><?php echo $hesklang['device_information']; ?></h4>
-                                        </div>
-                                        <div class="modal-body">
-                                            <script>
-                                                var userAgent = platform.parse('<?php echo addslashes($ticket['user_agent']); ?>');
-                                                console.log(userAgent);
-                                                var screenResWidth = <?php echo intval($ticket['screen_resolution_width']); ?>;
-                                                var screenResHeight = <?php echo intval($ticket['screen_resolution_height']); ?>;
-                                            </script>
-                                            <table class="table table-striped">
-                                                <tbody>
-                                                <tr>
-                                                    <td><strong><?php echo $hesklang['operating_system']; ?></strong>
-                                                    </td>
-                                                    <td id="operating-system">&nbsp;</td>
-                                                    <script>$('#operating-system').html(userAgent.os.toString());</script>
-                                                </tr>
-                                                <tr>
-                                                    <td><strong><?php echo $hesklang['browser']; ?></strong></td>
-                                                    <td id="browser">&nbsp;</td>
-                                                    <script>$('#browser').html(userAgent.name + ' ' + userAgent.version);</script>
-                                                </tr>
-                                                <tr>
-                                                    <td><strong><?php echo $hesklang['screen_resolution']; ?></strong>
-                                                    </td>
-                                                    <td id="screen-resolution">&nbsp;</td>
-                                                    <script>$('#screen-resolution').html(screenResWidth + ' x ' + screenResHeight);</script>
-                                                </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <?php
-                        endif;
+            echo '<div class="ticket-cell-admin col-md-3 col-sm-12 ';
+            if ($ticket['priority'] == 0) {
+                echo 'critical-priority">';
+            } elseif ($ticket['priority'] == 1) {
+                echo 'high-priority">';
+            } else {
+                echo 'med-low-priority">';
+            }
 
-                        if ($modsForHesk_settings['request_location']) {
-                            $locationText = '';
-                            $iconColor = '';
-                            $hasLocation = true;
-                            if (strpos($ticket['latitude'], 'E') === false) {
-                                $locationText = $hesklang['click_for_map'];
-                                $iconColor = 'inherit';
-                            } else {
-                                $hasLocation = false;
-                                $locationText = $hesklang['location_unavailable'];
-                                $iconColor = '#ccc';
-                            }
-                            ?>
-                            <span data-toggle="modal" data-target=".map-modal" style="cursor: pointer">
-                                <i class="fa fa-map-marker" data-toggle="tooltip" title="<?php echo $locationText; ?>"
-                                   style="color: <?php echo $iconColor; ?>"></i>
-                            </span>
-                            <div id="map-modal" class="modal fade map-modal" tabindex="-1" role="dialog"
-                                 aria-labelledby="myLargeModalLabel" aria-hidden="true">
-                                <div class="modal-dialog modal-lg">
-                                    <div class="modal-content">
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                                <span aria-hidden="true">&times;</span>
-                                            </button>
-                                            <h4><?php echo $hesklang['users_location']; ?></h4>
-                                        </div>
-                                        <div class="modal-body">
-                                            <?php if ($hasLocation): ?>
-                                                <div id="map" style="height: 500px"></div><br>
-                                                <address id="friendly-location" style="font-size: 13px"></address>
-                                                <p id="save-for-address"
-                                                   style="font-size: 13px;display:none"><?php echo $hesklang['save_to_see_updated_address']; ?></p>
-                                                <script>
-                                                    getFriendlyLocation(<?php echo $ticket['latitude']; ?>,
-                                                        <?php echo $ticket['longitude']; ?>);
-                                                </script>
-                                                <div class="row">
-                                                    <form action="admin_ticket.php" method="post" role="form">
-                                                        <input type="hidden" name="track"
-                                                               value="<?php echo $trackingID; ?>">
-                                                        <input type="hidden" name="token"
-                                                               value="<?php hesk_token_echo(); ?>">
-                                                        <input type="hidden" name="latitude" id="latitude"
-                                                               value="<?php echo $ticket['latitude']; ?>">
-                                                        <input type="hidden" name="longitude" id="longitude"
-                                                               value="<?php echo $ticket['longitude']; ?>">
+            echo '<p class="ticket-property-title">' . $hesklang['priority'] . '</p>';
 
-                                                        <div class="btn-group" style="display:none" id="save-group">
-                                                            <input type="submit" class="btn btn-success"
-                                                                   value="<?php echo $hesklang['save_location']; ?>">
-                                                            <button class="btn btn-default" data-dismiss="modal"
-                                                                    onclick="closeAndReset(<?php echo $ticket['latitude']; ?>, <?php echo $ticket['longitude']; ?>)">
-                                                                <?php echo $hesklang['close_modal_without_saving']; ?>
-                                                            </button>
-                                                        </div>
-                                                        <button id="close-button" class="btn btn-default"
-                                                                data-dismiss="modal"><?php echo $hesklang['close_modal']; ?></button>
-                                                    </form>
-                                                </div>
-                                                <?php
-                                            else:
-                                                $errorCode = explode('-', $ticket['latitude']);
-                                                $key = 'location_unavailable_' . $errorCode[1];
-                                                echo '<h5>' . $hesklang[$key] . '</h5>';
-                                            endif;
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        <?php
-                        // Only output JavaScript if we have coordinates
-                        if (strpos($ticket['latitude'], 'E') === false):
-                        ?>
-                            <script>
-                                var latitude = '';
-                                latitude = <?php echo $ticket['latitude'] != '' ? $ticket['latitude'] : -1; ?>;
-                                var longitude = '';
-                                longitude = <?php echo $ticket['longitude'] != '' ? $ticket['longitude'] : -1; ?>;
-                                initializeMapForStaff(latitude, longitude, "<?php echo $hesklang['users_location']; ?>");
-                            </script>
-                            <?php
-                        endif;
-                        }
-                        echo $ticket['subject'];
-                        ?></h3>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-3 col-sm-12" style="padding-top: 6px">
-                    <p><?php echo $hesklang['created_on'] . ': ' . hesk_date($ticket['dt'], true); ?></p>
-                </div>
-                <div class="col-md-3 col-sm-12" style="padding-top: 6px">
-                    <p><?php echo $hesklang['last_update'] . ': ' . hesk_date($ticket['lastchange'], true); ?></p>
-                </div>
-                <div class="col-md-6 col-sm-12 close-ticket">
-                    <?php
-                    $random = rand(10000, 99999);
-
-                    $statusSql = 'SELECT `ID`, `IsStaffClosedOption`, `IsStaffReopenedStatus` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsStaffClosedOption` = 1 OR `IsStaffReopenedStatus` = 1';
-                    $statusRs = hesk_dbQuery($statusSql);
-                    $staffClosedOptionStatus = array();
-                    $staffReopenedStatus = array();
-                    while ($statusRow = hesk_dbFetchAssoc($statusRs)) {
-                        if ($statusRow['IsStaffReopenedStatus'] == 1) {
-                            $staffReopenedStatus['ID'] = $statusRow['ID'];
-                        } else {
-                            $staffClosedOptionStatus['ID'] = $statusRow['ID'];
-                        }
-                    }
-
-                    $isTicketClosedSql = 'SELECT `IsClosed`, `Closable` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . $ticket['status'];
-                    $isTicketClosedRs = hesk_dbQuery($isTicketClosedSql);
-                    $isTicketClosedRow = hesk_dbFetchAssoc($isTicketClosedRs);
-                    $isTicketClosed = $isTicketClosedRow['IsClosed'];
-                    $isClosable = $isTicketClosedRow['Closable'] == 'yes' || $isTicketClosedRow['Closable'] == 'sonly';
-
-                    echo '<div class="btn-group" role="group">';
-                    $mgr = $isManager ? '&amp;isManager=1' : '';
-                    if ($isTicketClosed == 0 && $isClosable) // Ticket is still open
-                    {
-                        echo '<a
-		                        class="btn btn-default btn-sm" href="change_status.php?track=' . $trackingID . $mgr . '&amp;s=' . $staffClosedOptionStatus['ID'] . '&amp;Refresh=' . $random . '&amp;token=' . hesk_token_echo(0) . '">
-		                            <i class="fa fa-check-circle"></i> ' . $hesklang['close_action'] . '</a>';
-                    } elseif ($isTicketClosed == 1) {
-                        echo '<a
-		                        class="btn btn-default btn-sm" href="change_status.php?track=' . $trackingID . $mgr . '&amp;s=' . $staffReopenedStatus['ID'] . '&amp;Refresh=' . $random . '&amp;token=' . hesk_token_echo(0) . '">
-		                            <i class="fa fa-check-circle"></i> ' . $hesklang['open_action'] . '</a>';
-                    }
-
-                    $strippedName = strip_tags($ticket['name']);
-                    $strippedEmail = strip_tags($ticket['email']);
-                    $linkText = 'new_ticket.php?name=' . $strippedName . '&email=' . $strippedEmail . '&catid=' . $category['id'] . '&priority=' . $ticket['priority'];
-                    foreach ($hesk_settings['custom_fields'] as $k => $v) {
-                        if ($v['use'] == 1) {
-
-                            if ($v['type'] == 'checkbox') {
-                                $value = str_replace('<br />', '-CHECKBOX-', $ticket[$k]);
-                            } else {
-                                $value = $ticket[$k];
-                            }
-                            $strippedCustomField = strip_tags($value);
-                            $linkText .= '&c_' . $k . '=' . $strippedCustomField;
-                        }
-                    }
-
-                    echo '<a class="btn btn-default btn-sm" href="' . $linkText . '">
-                                      <i class="fa fa-plus"></i> ' . $hesklang['create_based_on_contact'] . '
-                                  </a>';
-                    echo '</div>';
-                    ?>
-                </div>
-            </div>
-            <div class="row medLowPriority">
-                <?php
-
-                $priorityLanguages = array(
-                    0 => $hesklang['critical'],
-                    1 => $hesklang['high'],
-                    2 => $hesklang['medium'],
-                    3 => $hesklang['low']
-                );
-                $options = array();
-                for ($i = 0; $i < 4; $i++) {
-                    $selected = $ticket['priority'] == $i ? 'selected' : '';
-                    array_push($options, '<option value="' . $i . '" ' . $selected . '>' . $priorityLanguages[$i] . '</option>');
-                }
-
-                echo '<div class="ticket-cell-admin col-md-3 col-sm-12 ';
-                if ($ticket['priority'] == 0) {
-                    echo 'criticalPriority">';
-                } elseif ($ticket['priority'] == 1) {
-                    echo 'highPriority">';
-                } else {
-                    echo 'medLowPriority">';
-                }
-
-                echo '<p class="ticketPropertyTitle">' . $hesklang['priority'] . '</p>';
-
-                echo '<form style="margin-bottom:0;" id="changePriorityForm" action="priority.php" method="post">
+            echo '<form style="margin-bottom:0;" id="changePriorityForm" action="priority.php" method="post">
 
                     <span style="white-space:nowrap;">
                     <select class="form-control" name="priority" onchange="document.getElementById(\'changePriorityForm\').submit();">';
-                echo implode('', $options);
-                echo '
+            echo implode('', $options);
+            echo '
                     </select>
 
                     <input type="submit" style="display: none" value="' . $hesklang['go'] . '" /><input type="hidden" name="track" value="' . $trackingID . '" />
                     <input type="hidden" name="token" value="' . hesk_token_echo(0) . '" />';
-                if ($isManager) {
-                    echo '<input type="hidden" name="isManager" value="1">';
-                }
-                echo '</span>
+            if ($isManager) {
+                echo '<input type="hidden" name="isManager" value="1">';
+            }
+            echo '</span>
 
                     </form>
 
                    </div>';
 
-                echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticketPropertyTitle">' . $hesklang['status'] . '</p>';
-                $status_options = array();
-                $results = mfh_getAllStatuses();
-                foreach ($results as $row) {
-                    $selected = $ticket['status'] == $row['ID'] ? 'selected' : '';
-                    $status_options[$row['ID']] = '<option value="' . $row['ID'] . '" ' . $selected . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                }
+            echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticket-property-title">' . $hesklang['status'] . '</p>';
+            $status_options = array();
+            $results = mfh_getAllStatuses();
+            foreach ($results as $row) {
+                $selected = $ticket['status'] == $row['ID'] ? 'selected' : '';
+                $status_options[$row['ID']] = '<option value="' . $row['ID'] . '" ' . $selected . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+            }
 
-                echo '
+            echo '
                     <form role="form" id="changeStatusForm" style="margin-bottom:0;" action="change_status.php" method="post">
                         <span style="white-space:nowrap;">
                             <select class="form-control" onchange="document.getElementById(\'changeStatusForm\').submit();" name="s">
@@ -1149,44 +997,44 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                             <input type="submit" style="display:none;" value="' . $hesklang['go'] . '" class="btn btn-default" /><input type="hidden" name="track" value="' . $trackingID . '" />
                             <input type="hidden" name="token" value="' . hesk_token_echo(0) . '" />';
-                if ($isManager) {
-                    echo '<input type="hidden" name="isManager" value="1">';
-                }
-                echo '</span>
+            if ($isManager) {
+                echo '<input type="hidden" name="isManager" value="1">';
+            }
+            echo '</span>
                     </form>
                     </div>';
-                echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticketPropertyTitle">' . $hesklang['owner'] . '</p>';
+            echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticket-property-title">' . $hesklang['owner'] . '</p>';
 
-                if (hesk_checkPermission('can_assign_others', 0) || $isManager) {
-                    echo '
+            if (hesk_checkPermission('can_assign_others', 0) || $isManager) {
+                echo '
                             <form style="margin-bottom:0;" id="changeOwnerForm" action="assign_owner.php" method="post">
                             <span style="white-space:nowrap;">
                             <select class="form-control"  name="owner" onchange="document.getElementById(\'changeOwnerForm\').submit();">';
-                    $selectedForUnassign = 'selected';
-                    foreach ($admins as $k => $v) {
-                        $selected = '';
-                        if ($k == $ticket['owner']) {
-                            $selectedForUnassign = '';
-                            $selected = 'selected';
-                        }
-                        echo '<option value="' . $k . '" ' . $selected . '>' . $v . '</option>';
+                $selectedForUnassign = 'selected';
+                foreach ($admins as $k => $v) {
+                    $selected = '';
+                    if ($k == $ticket['owner']) {
+                        $selectedForUnassign = '';
+                        $selected = 'selected';
                     }
-                    echo '<option value="-1" ' . $selectedForUnassign . '> &gt; ' . $hesklang['unas'] . ' &lt; </option>';
-                    echo '</select>
-                            <input type="submit" style="display: none" value="' . $hesklang['go'] . '" class="orangebutton" onmouseover="hesk_btn(this,\'orangebuttonover\');" onmouseout="hesk_btn(this,\'orangebutton\');" />
-                            <input type="hidden" name="track" value="' . $trackingID . '" />
-                            <input type="hidden" name="token" value="' . hesk_token_echo(0) . '" />
-                            </span>';
-                } else {
-                    echo '<p class="ticketPropertyText">';
-                    echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] :
-                        ($can_assign_self ? $hesklang['unas'] . ' [<a href="assign_owner.php?track=' . $trackingID . '&amp;owner=' . $_SESSION['id'] . '&amp;token=' . hesk_token_echo(0) . '">' . $hesklang['asss'] . '</a>]' : $hesklang['unas']);
-                    echo '</p>';
+                    echo '<option value="' . $k . '" ' . $selected . '>' . $v . '</option>';
                 }
-                echo '</form></div>';
-                echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticketPropertyTitle">' . $hesklang['category'] . '</p>';
-                if ($can_change_cat) {
-                    echo '
+                echo '<option value="-1" ' . $selectedForUnassign . '> &gt; ' . $hesklang['unas'] . ' &lt; </option>';
+                echo '</select>
+                            <input type="submit" style="display: none" value="' . $hesklang['go'] . '">
+                            <input type="hidden" name="track" value="' . $trackingID . '">
+                            <input type="hidden" name="token" value="' . hesk_token_echo(0) . '">
+                            </span>';
+            } else {
+                echo '<p class="ticket-property-text">';
+                echo isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] :
+                    ($can_assign_self ? $hesklang['unas'] . ' [<a href="assign_owner.php?track=' . $trackingID . '&amp;owner=' . $_SESSION['id'] . '&amp;token=' . hesk_token_echo(0) . '">' . $hesklang['asss'] . '</a>]' : $hesklang['unas']);
+                echo '</p>';
+            }
+            echo '</form></div>';
+            echo '<div class="col-md-3 col-sm-12 ticket-cell-admin"><p class="ticket-property-title">' . $hesklang['category'] . '</p>';
+            if ($can_change_cat) {
+                echo '
 
                         <form style="margin-bottom:0;" id="changeCategory" action="move_category.php" method="post">
 
@@ -1195,311 +1043,191 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             ' . $categories_options . '
                             </select>
 
-                            <input type="submit" style="display: none" value="' . $hesklang['go'] . '" /><input type="hidden" name="track" value="' . $trackingID . '" />
-                            <input type="hidden" name="token" value="' . hesk_token_echo(0) . '" />
+                            <input type="submit" style="display: none" value="' . $hesklang['go'] . '">
+                            <input type="hidden" name="track" value="' . $trackingID . '">
+                            <input type="hidden" name="token" value="' . hesk_token_echo(0) . '">
                             </span>
 
                         </form>';
-                } else {
-                    echo '<p class="ticketPropertyText">' . $category['name'] . '</p>';
-                }
-                echo '</div>';
-                ?>
+            } else {
+                echo '<p class="ticket-property-text">' . $category['name'] . '</p>';
+            }
+            echo '</div>';
+            ?>
+        </div>
+    </div>
+    <div class="box box-warning">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['notes']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
         </div>
-        <?php
-        $res = hesk_dbQuery("SELECT t1.*, t2.`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "notes` AS t1 LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS t2 ON t1.`who` = t2.`id` WHERE `ticket`='" . intval($ticket['id']) . "' ORDER BY t1.`id` " . ($hesk_settings['new_top'] ? 'DESC' : 'ASC'));
-        while ($note = hesk_dbFetchAssoc($res)) {
+        <div class="box-body">
+            <?php
+            $res = hesk_dbQuery("SELECT t1.*, t2.`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "notes` AS t1 LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS t2 ON t1.`who` = t2.`id` WHERE `ticket`='" . intval($ticket['id']) . "' ORDER BY t1.`id` " . ($hesk_settings['new_top'] ? 'DESC' : 'ASC'));
+            if (hesk_dbNumRows($res) > 0):
+                $first = true;
+                while ($note = hesk_dbFetchAssoc($res)):
+                    if (!$first) {
+                        echo '<hr>';
+                    } else {
+                        $first = false;
+                    }
             ?>
             <div class="row">
-                <div class="col-md-12 alert-warning">
-                    <div class="row" style="padding-top: 10px; padding-bottom: 10px">
-                        <div class="col-md-8">
-                            <p><i><?php echo $hesklang['noteby']; ?>
-                                    <b><?php echo($note['name'] ? $note['name'] : $hesklang['e_udel']); ?></b></i>
-                                - <?php echo hesk_date($note['dt'], true); ?></p>
-                            <?php
-                            // Message
-                            echo $note['message'];
+                <div class="col-md-8">
+                    <p><i><?php echo $hesklang['noteby']; ?>
+                            <b><?php echo($note['name'] ? $note['name'] : $hesklang['e_udel']); ?></b></i>
+                        - <?php echo hesk_date($note['dt'], true); ?></p>
+                    <?php
+                    // Message
+                    echo $note['message'];
 
-                            // Attachments
-                            if ($hesk_settings['attachments']['use'] && strlen($note['attachments'])) {
-                                echo strlen($note['message']) ? '<br /><br />' : '';
+                    // Attachments
+                    if ($hesk_settings['attachments']['use'] && strlen($note['attachments'])) {
+                        echo strlen($note['message']) ? '<br><br>' : '';
 
-                                $att = explode(',', substr($note['attachments'], 0, -1));
-                                $num = count($att);
-                                foreach ($att as $myatt) {
-                                    list($att_id, $att_name) = explode('#', $myatt);
+                        $att = explode(',', substr($note['attachments'], 0, -1));
+                        $num = count($att);
+                        foreach ($att as $myatt) {
+                            list($att_id, $att_name) = explode('#', $myatt);
 
-                                    // Can edit and delete note (attachments)?
-                                    if ($can_del_notes || $note['who'] == $_SESSION['id']) {
-                                        // If this is the last attachment and no message, show "delete ticket" link
-                                        if ($num == 1 && strlen($note['message']) == 0) {
-                                            echo '<a href="admin_ticket.php?delnote=' . $note['id'] . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');">
-                                                    <i class="fa fa-times" style="font-size:16px;color:red;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dela'] . '"></i>
-                                                </a> ';
-                                        } // Show "delete attachment" link
-                                        else {
-                                            echo '<a href="admin_ticket.php?delatt=' . $att_id . '&amp;note=' . $note['id'] . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');">
-                                                    <i class="fa fa-times" style="font-size:16px;color:red;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dela'] . '"></i>
-                                                </a> ';
-                                        }
-                                    }
-
-                                    echo '
-                                        <a href="../download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '">
-                                            <i class="fa fa-paperclip" style="font-size:16px;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dnl'] . ' ' . $att_name . '"></i>
-                                        </a>
-                                        <a href="../download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '">' . $att_name . '</a><br />
-                                    ';
+                            // Can edit and delete note (attachments)?
+                            if ($can_del_notes || $note['who'] == $_SESSION['id']) {
+                                // If this is the last attachment and no message, show "delete ticket" link
+                                if ($num == 1 && strlen($note['message']) == 0) {
+                                    echo '<a href="admin_ticket.php?delnote=' . $note['id'] . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');">
+                                                <i class="fa fa-times" style="font-size:16px;color:red;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dela'] . '"></i>
+                                            </a> ';
+                                } // Show "delete attachment" link
+                                else {
+                                    echo '<a href="admin_ticket.php?delatt=' . $att_id . '&amp;note=' . $note['id'] . '&amp;track=' . $trackingID . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($hesklang['pda']) . '\');">
+                                                <i class="fa fa-times" style="font-size:16px;color:red;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dela'] . '"></i>
+                                            </a> ';
                                 }
                             }
-                            ?>
-                        </div>
-                        <div class="col-md-4 text-right">
-                            <?php if ($can_del_notes || $note['who'] == $_SESSION['id']) { ?>
-                                <div class="btn-group" role="group">
-                                    <a href="edit_note.php?track=<?php echo $trackingID; ?>&amp;Refresh=<?php echo mt_rand(10000, 99999); ?>&amp;note=<?php echo $note['id']; ?>&amp;token=<?php hesk_token_echo(); ?>"
-                                       class="btn btn-warning">
-                                        <i class="fa fa-pencil"></i>&nbsp;<?php echo $hesklang['ednote']; ?>
+
+                            echo '
+                                    <a href="../download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '">
+                                        <i class="fa fa-paperclip" style="font-size:16px;" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['dnl'] . ' ' . $att_name . '"></i>
                                     </a>
-                                    <a href="admin_ticket.php?track=<?php echo $trackingID; ?>&amp;Refresh=<?php echo mt_rand(10000, 99999); ?>&amp;delnote=<?php echo $note['id']; ?>&amp;token=<?php hesk_token_echo(); ?>"
-                                       class="btn btn-danger">
-                                        <i class="fa fa-times"></i>&nbsp;<?php echo $hesklang['delnote']; ?>
-                                    </a>
-                                </div>
-                            <?php } ?>
-                        </div>
-                    </div>
+                                    <a href="../download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . '">' . $att_name . '</a><br />
+                                ';
+                        }
+                    }
+                    ?>
+                </div>
+                <div class="col-md-4 text-right">
+                    <?php if ($can_del_notes || $note['who'] == $_SESSION['id']) { ?>
+                        <a href="edit_note.php?track=<?php echo $trackingID; ?>&amp;Refresh=<?php echo mt_rand(10000, 99999); ?>&amp;note=<?php echo $note['id']; ?>&amp;token=<?php hesk_token_echo(); ?>">
+                            <i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="<?php echo $hesklang['ednote']; ?>"></i>
+                        </a>&nbsp;
+                        <a href="admin_ticket.php?track=<?php echo $trackingID; ?>&amp;Refresh=<?php echo mt_rand(10000, 99999); ?>&amp;delnote=<?php echo $note['id']; ?>&amp;token=<?php hesk_token_echo(); ?>">
+                            <i class="fa fa-times icon-link red" data-toggle="tooltip" title="<?php echo $hesklang['delnote']; ?>"></i>
+                        </a>
+                    <?php } ?>
                 </div>
             </div>
             <?php
-        }
-        ?>
-        <div class="row">
-            <div class="col-md-12">
-                <b><i><?php echo $hesklang['notes']; ?>: </i></b>
-                <?php
-                if ($can_reply) {
-                    ?>
-                    &nbsp; <a href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('notesform')"><i
-                            class="fa fa-plus"></i> <?php echo $hesklang['addnote']; ?></a>
-                    <?php
-                }
+                endwhile;
+            else:
                 ?>
-
-                <div id="notesform" style="display:<?php echo isset($_SESSION['note_message']) ? 'block' : 'none'; ?>">
-                    <form class="form-horizontal" data-toggle="validator" method="post" action="admin_ticket.php" style="margin:0px; padding:0px;"
-                          enctype="multipart/form-data">
-                        <div class="row">
-                            <div class="col-md-6">
-                                <div class="form-group">
-                                    <textarea style="min-height: 150px" data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']) ?>" class="form-control" name="notemsg" rows="6"
-                                              cols="60" required><?php echo isset($_SESSION['note_message']) ? stripslashes(hesk_input($_SESSION['note_message'])) : ''; ?></textarea>
+                <?php echo $hesklang['no_notes_for_this_ticket']; ?>
+            <?php endif; ?>
+        </div>
+        <?php if ($can_reply): ?>
+        <div class="box-footer">
+            <button class="btn btn-default pull-right" data-toggle="modal" data-target="#noteform">
+                <i class="fa fa-plus-circle"></i> <?php echo $hesklang['addnote']; ?>
+            </button>
+        </div>
+        <?php endif; ?>
+    </div>
+    <div class="modal fade" tabindex="-1" role="dialog" id="noteform">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title"><?php echo $hesklang['addnote']; ?></h4>
+                </div>
+                <form class="form-horizontal" data-toggle="validator" method="post" action="admin_ticket.php" style="margin:0px; padding:0px;"
+                      enctype="multipart/form-data">
+                    <div class="modal-body">
+                            <div class="form-group">
+                                <label for="note-message" class="control-label col-sm-2"><?php echo $hesklang['message']; ?></label>
+                                <div class="col-sm-10">
+                                    <textarea id="note-message" style="min-height: 150px" data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']) ?>" class="form-control" name="notemsg" rows="6"
+                                          cols="60" required><?php echo isset($_SESSION['note_message']) ? stripslashes(hesk_input($_SESSION['note_message'])) : ''; ?></textarea>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
-                            <div class="col-md-6">
-                                <div class="form-group">
+                            <div class="form-group">
+                                <label for="note-attachments" class="control-label col-sm-2">
+                                    <?php echo $hesklang['attachments']; ?>
+                                </label>
+                                <div class="col-sm-10">
                                     <?php build_dropzone_markup(true, 'notesFiledrop'); ?>
                                 </div>
                             </div>
-                        </div>
-                        <?php display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php', 'notesFiledrop'); ?>
-                        <input class="btn btn-default" type="submit" value="<?php echo $hesklang['s']; ?>"/><input
-                            type="hidden" name="track" value="<?php echo $trackingID; ?>"/>
-                        <i><?php echo $hesklang['nhid']; ?></i>
-                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <div class="blankSpace"></div>
-        <!-- END TICKET HEAD -->
-
-        <?php
-        /* Reply form on top? */
-        if ($can_reply && $hesk_settings['reply_top'] == 1) {
-            hesk_printReplyForm();
-            echo '<br />';
-        }
-        ?>
-
-        <!-- START TICKET REPLIES -->
-
-        <?php
-        if ($hesk_settings['new_top']) {
-            $i = hesk_printTicketReplies() ? 0 : 1;
-        } else {
-            $i = 1;
-        }
-
-        /* Make sure original message is in correct color if newest are on top */
-        $color = 'class="ticketMessageContainer"';
-        ?>
-        <div class="row ticketMessageContainer">
-            <div class="col-md-3 col-xs-12">
-                <div class="ticketName"><?php echo $ticket['name']; ?></div>
-                <div class="ticketEmail">
-                    <?php
-                    if ($can_ban_emails && !empty($ticket['email'])) {
-                        if ($email_id = hesk_isBannedEmail($ticket['email'])) {
-                            if ($can_unban_emails) {
-                                echo '<a href="banned_emails.php?a=unban&amp;track=' . $trackingID . '&amp;id=' . intval($email_id) . '&amp;token=' . hesk_token_echo(0) . '">
-                                        <i class="fa fa-ban" style="font-size:16px;color:red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['eisban'] . ' ' . $hesklang['click_unban'] . '"></i>
-                                    </a> ';
-                            } else {
-                                echo '<i class="fa fa-ban" style="font-size:16px;color:red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['eisban'] . '"></i>';
-                            }
-                        } else {
-                            echo '<a href="banned_emails.php?a=ban&amp;track=' . $trackingID . '&amp;email=' . urlencode($ticket['email']) . '&amp;token=' . hesk_token_echo(0) . '">
-                                    <i class="fa fa-ban" style="font-size:16px;color:grey" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['savebanemail'] . '"></i>
-                                </a> ';
-                        }
-                    }
-                    ?><a href="mailto:<?php echo $ticket['email']; ?>"><?php echo $ticket['email']; ?></a>
-                </div>
-                <div class="ticketEmail"><?php echo $hesklang['ip']; ?>:
-                    <?php
-
-                    // Format IP for lookup
-                    if ($ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
-                        echo $hesklang['unknown'];
-                    } else {
-                        if ($can_ban_ips) {
-                            if ($ip_id = hesk_isBannedIP($ticket['ip'])) {
-                                if ($can_unban_ips) {
-                                    echo '<a href="banned_ips.php?a=unban&amp;track=' . $trackingID . '&amp;id=' . intval($ip_id) . '&amp;token=' . hesk_token_echo(0) . '">
-                                            <i class="fa fa-ban" style="font-size:16px;color:red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['ipisban'] . ' ' . $hesklang['click_unban'] . '"></i>
-                                        </a> ';
-                                } else {
-                                    echo '<i class="fa fa-ban" style="font-size:16px;color:red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['ipisban'] . '"></i>';
-                                }
-                            } else {
-                                echo '<a href="banned_ips.php?a=ban&amp;track=' . $trackingID . '&amp;ip=' . urlencode($ticket['ip']) . '&amp;token=' . hesk_token_echo(0) . '">
-                                        <i class="fa fa-ban" style="font-size:16px;color:grey" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['savebanip'] . '"></i>
-                                    </a> ';
-                            }
-                        }
-
-                        echo '<a href="../ip_whois.php?ip=' . urlencode($ticket['ip']) . '">' . $ticket['ip'] . '</a>';
-                    }
-                    ?>
-                </div>
-            </div>
-            <div class="col-md-9 col-xs-12 pushMarginLeft">
-                <div class="ticketMessageTop withBorder">
-                    <!-- Action Buttons -->
-                    <?php echo hesk_getAdminButtonsInTicket(0, $i); ?>
-
-                    <!-- Date -->
-                    <p><br/><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt'], true); ?>
-
-                        <!-- Custom Fields Before Message -->
-                        <?php
-                        foreach ($hesk_settings['custom_fields'] as $k => $v) {
-                            if ($v['use'] && $v['place'] == 0) {
-                                if ($modsForHesk_settings['custom_field_setting']) {
-                                    $v['name'] = $hesklang[$v['name']];
-                                }
-
-                                echo '<p>' . $v['name'] . ': ';
-                                if ($v['type'] == 'date' && !empty($ticket[$k])) {
-                                    $dt = date('Y-m-d h:i:s', $ticket[$k]);
-                                    echo hesk_dateToString($dt, 0);
-                                } else {
-                                    echo $ticket[$k];
-                                }
-                                echo '</p>';
-                            }
-                        }
-                        ?>
-                </div>
-                <div class="ticketMessageBottom">
-                    <!-- Message -->
-                    <p><b><?php echo $hesklang['message']; ?>:</b></p>
-
-                    <div class="message">
-                        <?php if ($ticket['html']) {
-                            echo hesk_html_entity_decode($ticket['message']);
-                        } else {
-                            echo $ticket['message'];
-                        } ?>
+                            <?php display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php', 'notesFiledrop'); ?>
                     </div>
-                </div>
-                <div class="ticketMessageTop">
-                    <!-- Custom Fields after Message -->
-                    <?php
-                    foreach ($hesk_settings['custom_fields'] as $k => $v) {
-                        if ($v['use'] && $v['place']) {
-                            if ($modsForHesk_settings['custom_field_setting']) {
-                                $v['name'] = $hesklang[$v['name']];
-                            }
-
-                            echo '<p>' . $v['name'] . ': ';
-                            if ($v['type'] == 'date' && !empty($ticket[$k])) {
-                                $dt = date('Y-m-d h:i:s', $ticket[$k]);
-                                echo hesk_dateToString($dt, 0);
-                            } else {
-                                echo $ticket[$k];
-                            }
-                            echo '</p>';
-                        }
-                    }
-                    /* Attachments */
-                    mfh_listAttachments($ticket['attachments'], 0, true);
-
-                    // Show suggested KB articles
-                    if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && strlen($ticket['articles'])) {
-                        $suggested = array();
-                        $suggested_list = '';
-
-                        // Get article info from the database
-                        $articles = hesk_dbQuery("SELECT `id`,`subject` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "kb_articles` WHERE `id` IN (" . preg_replace('/[^0-9\,]/', '', $ticket['articles']) . ")");
-                        while ($article = hesk_dbFetchAssoc($articles)) {
-                            $suggested[$article['id']] = '<a href="../knowledgebase.php?article=' . $article['id'] . '">' . $article['subject'] . '</a><br />';
-                        }
-
-                        // Loop through the IDs to preserve the order they were suggested in
-                        $articles = explode(',', $ticket['articles']);
-                        foreach ($articles as $article) {
-                            if (isset($suggested[$article])) {
-                                $suggested_list .= $suggested[$article];
-                            }
-                        }
-
-                        // Finally print suggested articles
-                        if (strlen($suggested_list)) {
-                            $suggested_list = '<hr /><i>' . $hesklang['taws'] . '</i><br />' . $suggested_list . '&nbsp;';
-                            echo $_SESSION['show_suggested'] ? $suggested_list : '<a href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay(\'suggested_articles\')">' . $hesklang['sska'] . '</a><span id="suggested_articles" style="display:none">' . $suggested_list . '</span>';
-                        }
-                    }
-                    ?>
-                </div>
+                    <div class="modal-footer">
+                        <i><?php echo $hesklang['nhid']; ?></i>&nbsp;
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
+                            <input type="submit" class="btn btn-success" value="<?php echo $hesklang['s']; ?>">
+                        </div>
+                        <input type="hidden" name="track" value="<?php echo $trackingID; ?>">
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
+                    </div>
+                </form>
             </div>
         </div>
-        <?php
-        if (!$hesk_settings['new_top']) {
-            hesk_printTicketReplies();
-        }
-        ?>
-
-        <?php
-        /* Reply form on bottom? */
-        if ($can_reply && !$hesk_settings['reply_top']) {
-            hesk_printReplyForm();
-        }
-
-        /* Display ticket history */
-        if (strlen($ticket['history'])) {
-            ?>
-            <h3><?php echo $hesklang['thist']; ?></h3>
-            <div class="footerWithBorder blankSpace"></div>
-            <ul><?php echo $ticket['history']; ?></ul>
-        <?php }
-        ?>
     </div>
-</div>
+    <?php
+    /* Reply form on top? */
+    if ($can_reply && $hesk_settings['reply_top'] == 1) {
+        hesk_printReplyForm();
+    }
+
+    /* Do we need or have any canned responses? */
+    $can_options = hesk_printCanned();
+
+    hesk_printTicketReplies();
+
+    echo '<br>';
+
+    /* Reply form on bottom? */
+    if ($can_reply && !$hesk_settings['reply_top']) {
+        hesk_printReplyForm();
+    }
+
+    /* Display ticket history */
+    if (strlen($ticket['history'])) {
+        ?>
+        <div class="box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['thist']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-minus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <?php echo $ticket['history']; ?>
+            </div>
+        </div>
+    <?php }
+    ?>
+</section>
 <div style="display: none">
     <p id="lang_ticket_due_date_updated"><?php echo $hesklang['ticket_due_date_updated']; ?></p>
     <p id="lang_none"><?php echo $hesklang['none']; ?></p>
@@ -1518,74 +1246,232 @@ require_once(HESK_PATH . 'inc/footer.inc.php');
 
 /*** START FUNCTIONS ***/
 
-function hesk_getAdminButtons($reply = 0, $white = 1)
+function hesk_getAdminButtons($category_id)
 {
-    global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
+    global $hesk_settings, $hesklang, $modsForHesk_settings, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
 
-    $options = '<div class="btn-group" style="width: 100%">';
-
-    /* Style and mousover/mousout */
-    $tmp = $white ? 'White' : 'Blue';
-    $style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"';
-
-    /* Lock ticket button */
-    if ( /* ! $reply && */
-    $can_edit
-    ) {
-        if ($ticket['locked']) {
-            $des = $hesklang['tul'] . ' - ' . $hesklang['isloc'];
-            $options .= '<a class="btn btn-default" href="lock.php?track=' . $trackingID . '&amp;locked=0&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-unlock"></i> ' . $hesklang['tul'] . '</a> ';
-        } else {
-            $des = $hesklang['tlo'] . ' - ' . $hesklang['isloc'];
-            $options .= '<a class="btn btn-default" href="lock.php?track=' . $trackingID . '&amp;locked=1&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-lock"></i> ' . $hesklang['tlo'] . '</a> ';
-        }
-    }
-
-    /* Tag ticket button */
-    if ( /* ! $reply && */
-    $can_archive
-    ) {
-        if ($ticket['archive']) {
-            $options .= '<a class="btn btn-default" href="archive.php?track=' . $trackingID . '&amp;archived=0&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-tag"></i>' . $hesklang['remove_archive'] . '</a> ';
-        } else {
-            $options .= '<a class="btn btn-default" href="archive.php?track=' . $trackingID . '&amp;archived=1&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-tag"></i> ' . $hesklang['add_archive'] . '</a> ';
-        }
-    }
-
-    /* Import to knowledgebase button */
-    if ($hesk_settings['kb_enable'] && hesk_checkPermission('can_man_kb', 0)) {
-        $options .= '<a class="btn btn-default" href="manage_knowledgebase.php?a=import_article&amp;track=' . $trackingID . '"><i class="fa fa-lightbulb-o"></i> ' . $hesklang['import_kb'] . '</a> ';
-    }
-
-    /* Print ticket button */
-    $options .= '<a class="btn btn-default" href="../print.php?track=' . $trackingID . '"><i class="fa fa-print"></i> ' . $hesklang['printer_friendly'] . '</a> ';
+    $options = '';
 
     /* Edit post */
     if ($can_edit) {
         $tmp = $reply ? '&amp;reply=' . $reply['id'] : '';
         $mgr = $isManager ? '&amp;isManager=true' : '';
-        $options .= '<a class="btn btn-default" href="edit_post.php?track=' . $trackingID . $tmp . $mgr . '"><i class="fa fa-pencil"></i> ' . $hesklang['edtt'] . '</a> ';
+        $options .= '<a class="btn btn-default" href="edit_post.php?track=' . $trackingID . $tmp . $mgr . '"><i class="fa fa-pencil orange"></i> ' . $hesklang['edit'] . '</a> ';
     }
 
 
+    /* Print ticket button */
+    $options .= '<a class="btn btn-default" href="../print.php?track=' . $trackingID . '"><i class="fa fa-print"></i> ' . $hesklang['printer_friendly'] . '</a> ';
+
     /* Delete ticket */
     if ($can_delete) {
         if ($reply) {
             $url = 'admin_ticket.php';
             $tmp = 'delete_post=' . $reply['id'];
-            $img = 'delete.png';
             $txt = $hesklang['delt'];
         } else {
             $url = 'delete_tickets.php';
             $tmp = 'delete_ticket=1';
-            $img = 'delete_ticket.png';
             $txt = $hesklang['dele'];
         }
-        $options .= '<a class="btn btn-default" href="' . $url . '?track=' . $trackingID . '&amp;' . $tmp . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($txt) . '?\');"><i class="fa fa-ban"></i> ' . $txt . '</a> ';
+        $options .= '<a class="btn btn-default" href="' . $url . '?track=' . $trackingID . '&amp;' . $tmp . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . hesk_makeJsString($txt) . '?\');"><i class="fa fa-times red"></i> ' . $txt . '</a> ';
     }
 
+    $dropdown = '
+<div class="btn-group">
+    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <i class="fa fa-ellipsis-h"></i> ' . hesk_htmlspecialchars($hesklang['more']) . ' <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu pull-right">';
+
+    // Location and UA
+    $has_location_or_user_agent = false;
+
+    if ($modsForHesk_settings['display_user_agent_information']
+        && $ticket['user_agent'] !== NULL
+        && $ticket['screen_resolution_height'] !== NULL
+        && $ticket['screen_resolution_height'] != 0
+        && $ticket['screen_resolution_width'] !== NULL
+        && $ticket['screen_resolution_width'] != 0
+    ) {
+        $has_location_or_user_agent = true;
+        $dropdown .=
+            '<li><a href="javascript:;" data-toggle="modal" data-target="#user-agent-modal"><i class="fa fa-desktop fa-fw"></i> ' . $hesklang['device_information'] . '</a></li>';
+        buildUserAgentModal($ticket['user_agent'], $ticket['screen_resolution_width'], $ticket['screen_resolution_height']);
+    } else if ($modsForHesk_settings['display_user_agent_information']) {
+        $has_location_or_user_agent = true;
+        $dropdown .=
+            '<li><span href="javascript:;" class="linkless-dropdown gray"><i class="fa fa-desktop fa-fw"></i> ' . $hesklang['no_device_information'] . '</span></li>';
+    }
+        ?>
+        <?php
+    if ($modsForHesk_settings['request_location']) {
+        $hasLocation = true;
+        $has_location_or_user_agent = true;
+        if (strpos($ticket['latitude'], 'E') === false) {
+            $locationText = $hesklang['click_for_map'];
+            $iconColor = '';
+        } else {
+            $hasLocation = false;
+            $locationText = $hesklang['location_unavailable'];
+            $iconColor = 'class="grey"';
+        }
+        $dropdown .= '<li><a href="javascript:;" data-toggle="modal" data-target=".map-modal" ' . $iconColor . '><i class="fa fa-map-marker fa-fw"></i> ' . $locationText . ' </a></li>';
+        ?>
+        <div id="map-modal" class="modal fade map-modal" tabindex="-1" role="dialog"
+             aria-labelledby="myLargeModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4><?php echo $hesklang['users_location']; ?></h4>
+                    </div>
+                    <div class="modal-body">
+                        <?php if ($hasLocation): ?>
+           '               <div id="map" style="height: 500px"></div><br>
+                            <address id="friendly-location" style="font-size: 13px"></address>
+                            <p id="save-for-address"
+                               style="font-size: 13px;display:none"><?php echo $hesklang['save_to_see_updated_address']; ?></p>
+                            <script>
+                                getFriendlyLocation(<?php echo $ticket['latitude']; ?>,
+                                    <?php echo $ticket['longitude']; ?>);
+                            </script>
+                            <div class="row">
+                                <form action="admin_ticket.php" method="post" role="form">
+                                    <input type="hidden" name="track"
+                                           value="<?php echo $trackingID; ?>">
+                                    <input type="hidden" name="token"
+                                           value="<?php hesk_token_echo(); ?>">
+                                    <input type="hidden" name="latitude" id="latitude"
+                                           value="<?php echo $ticket['latitude']; ?>">
+                                    <input type="hidden" name="longitude" id="longitude"
+                                           value="<?php echo $ticket['longitude']; ?>">
+
+                                    <div class="col-sm-12">
+                                        <div class="btn-group" style="display:none" id="save-group">
+                                            <input type="submit" class="btn btn-success"
+                                                   value="<?php echo $hesklang['save_location']; ?>">
+                                            <button class="btn btn-default" data-dismiss="modal"
+                                                    onclick="closeAndReset(<?php echo $ticket['latitude']; ?>, <?php echo $ticket['longitude']; ?>)">
+                                                <?php echo $hesklang['close_modal_without_saving']; ?>
+                                            </button>
+                                        </div>
+                                        <div class="btn-group">
+                                            <button id="close-button" class="btn btn-default"
+                                                    data-dismiss="modal"><?php echo $hesklang['close_modal']; ?></button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                            <?php
+                        else:
+                            $errorCode = explode('-', $ticket['latitude']);
+                            $key = 'location_unavailable_' . $errorCode[1];
+                            echo '<h5>' . $hesklang[$key] . '</h5>';
+                        endif;
+                        ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <?php
+        // Only output JavaScript if we have coordinates
+        if (strpos($ticket['latitude'], 'E') === false):
+            ?>
+            <script>
+                var latitude = '';
+                latitude = <?php echo $ticket['latitude'] != '' ? $ticket['latitude'] : -1; ?>;
+                var longitude = '';
+                longitude = <?php echo $ticket['longitude'] != '' ? $ticket['longitude'] : -1; ?>;
+                initializeMapForStaff(latitude, longitude, "<?php echo $hesklang['users_location']; ?>");
+            </script>
+            <?php
+        endif;
+    }
+
+    // If there is device info enabled or location, separate them from the rest of the items in the dropdown.
+    if ($has_location_or_user_agent) {
+        $dropdown .= '<li role="separator" class="divider"></li>';
+    }
+
+    /* Close/Reopen ticket link */
+    $random = rand(10000, 99999);
+
+    $statusSql = 'SELECT `ID`, `IsStaffClosedOption`, `IsStaffReopenedStatus` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsStaffClosedOption` = 1 OR `IsStaffReopenedStatus` = 1';
+    $statusRs = hesk_dbQuery($statusSql);
+    $staffClosedOptionStatus = array();
+    $staffReopenedStatus = array();
+    while ($statusRow = hesk_dbFetchAssoc($statusRs)) {
+        if ($statusRow['IsStaffReopenedStatus'] == 1) {
+            $staffReopenedStatus['ID'] = $statusRow['ID'];
+        } else {
+            $staffClosedOptionStatus['ID'] = $statusRow['ID'];
+        }
+    }
+
+    $isTicketClosedSql = 'SELECT `IsClosed`, `Closable` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `ID` = ' . $ticket['status'];
+    $isTicketClosedRs = hesk_dbQuery($isTicketClosedSql);
+    $isTicketClosedRow = hesk_dbFetchAssoc($isTicketClosedRs);
+    $isTicketClosed = $isTicketClosedRow['IsClosed'];
+    $isClosable = $isTicketClosedRow['Closable'] == 'yes' || $isTicketClosedRow['Closable'] == 'sonly';
+
+    $mgr = $isManager ? '&amp;isManager=1' : '';
+    if ($isTicketClosed == 0 && $isClosable) // Ticket is still open
+    {
+        $dropdown .= '<li><a href="change_status.php?track=' . $trackingID . $mgr . '&amp;s=' . $staffClosedOptionStatus['ID'] . '&amp;Refresh=' . $random . '&amp;token=' . hesk_token_echo(0) . '">
+                    <i class="fa fa-check-circle fa-fw"></i> ' . $hesklang['close_action'] . '</a></li>';
+    } elseif ($isTicketClosed == 1) {
+        $dropdown .= '<li><a href="change_status.php?track=' . $trackingID . $mgr . '&amp;s=' . $staffReopenedStatus['ID'] . '&amp;Refresh=' . $random . '&amp;token=' . hesk_token_echo(0) . '">
+                    <i class="fa fa-check-circle fa-fw"></i> ' . $hesklang['open_action'] . '</a></li>';
+    }
+
+    /* Lock ticket button */
+    if ($can_edit) {
+        $template = '<li><a href="lock.php?track=' . $trackingID . '&amp;locked=%s&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-%s fa-fw"></i> %s</a></li>';
+        $dropdown .= $ticket['locked']
+            ? sprintf($template, 0, 'unlock', $hesklang['tul'])
+            : sprintf($template, 1, 'lock', $hesklang['tlo']);
+    }
+
+    /* Tag ticket button */
+    if ($can_archive) {
+        $template = '<li><a href="archive.php?track=' . $trackingID . '&amp;archived=%s&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-tag fa-fw"></i> %s</a></li>';
+
+        $dropdown .= $ticket['archive']
+            ? sprintf($template, 0, $hesklang['remove_archive'])
+            : sprintf($template, 1, $hesklang['add_archive']);
+    }
+
+    /* Import to knowledgebase button */
+    if ($hesk_settings['kb_enable'] && hesk_checkPermission('can_man_kb', 0)) {
+        $dropdown .= '<li><a href="manage_knowledgebase.php?a=import_article&amp;track=' . $trackingID . '"><i class="fa fa-lightbulb-o fa-fw"></i> ' . $hesklang['import_kb'] . '</a></li>';
+    }
+
+    /* Create ticket for same contact button */
+    $strippedName = strip_tags($ticket['name']);
+    $strippedEmail = strip_tags($ticket['email']);
+    $linkText = 'new_ticket.php?name=' . $strippedName . '&email=' . $strippedEmail . '&catid=' . $category_id . '&priority=' . $ticket['priority'];
+    foreach ($hesk_settings['custom_fields'] as $k => $v) {
+        if ($v['use'] == 1) {
+
+            if ($v['type'] == 'checkbox') {
+                $value = str_replace('<br />', '-CHECKBOX-', $ticket[$k]);
+            } else {
+                $value = $ticket[$k];
+            }
+            $strippedCustomField = strip_tags($value);
+            $linkText .= '&c_' . $k . '=' . $strippedCustomField;
+        }
+    }
+
+    $dropdown .= '<li><a href="' . $linkText . '"><i class="fa fa-plus fa-fw"></i> ' . $hesklang['create_based_on_contact'] . '</a></li>';
+    $dropdown .= '</ul></div> ';
+    $options .= $dropdown;
+
     /* Return generated HTML */
-    $options .= '</div>';
     return $options;
 
 } // END hesk_getAdminButtons()
@@ -1594,17 +1480,13 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
 {
     global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager;
 
-    $options = '<div class="btn-group text-right" style="width: 70%; margin-left: auto; margin-right: auto">';
-
-    /* Style and mousover/mousout */
-    $tmp = $white ? 'White' : 'Blue';
-    $style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"';
+    $options = $reply ? '' : '<div class="pull-right">';
 
     /* Edit post */
     if ($can_edit) {
         $tmp = $reply ? '&amp;reply=' . $reply['id'] : '';
         $mgr = $isManager ? '&amp;isManager=true' : '';
-        $options .= '<a class="btn btn-default" href="edit_post.php?track=' . $trackingID . $tmp . $mgr . '"><i class="fa fa-pencil"></i> ' . $hesklang['edtt'] . '</a> ';
+        $options .= '<a class="btn btn-default" href="edit_post.php?track=' . $trackingID . $tmp . $mgr . '"><i class="fa fa-pencil orange"></i> ' . $hesklang['edtt'] . '</a> ';
     }
 
 
@@ -1613,19 +1495,17 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
         if ($reply) {
             $url = 'admin_ticket.php';
             $tmp = 'delete_post=' . $reply['id'];
-            $img = 'delete.png';
             $txt = $hesklang['delt'];
         } else {
             $url = 'delete_tickets.php';
             $tmp = 'delete_ticket=1';
-            $img = 'delete_ticket.png';
             $txt = $hesklang['dele'];
         }
-        $options .= '<a class="btn btn-default" href="' . $url . '?track=' . $trackingID . '&amp;' . $tmp . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . $txt . '?\');"><i class="fa fa-ban"></i> ' . $txt . '</a> ';
+        $options .= '<a class="btn btn-default" href="' . $url . '?track=' . $trackingID . '&amp;' . $tmp . '&amp;Refresh=' . mt_rand(10000, 99999) . '&amp;token=' . hesk_token_echo(0) . '" onclick="return hesk_confirmExecute(\'' . $txt . '?\');"><i class="fa fa-times red"></i> ' . $txt . '</a> ';
     }
 
     /* Return generated HTML */
-    $options .= '</div>';
+    $options .= $reply ? '' : '</div>';
     return $options;
 
 } // END hesk_getAdminButtonsInTicket()
@@ -1673,64 +1553,192 @@ function print_form()
     exit();
 } // End print_form()
 
-
-function hesk_printTicketReplies()
-{
-    global $hesklang, $hesk_settings, $result, $reply, $isManager, $modsForHesk_settings;
-
-    $i = $hesk_settings['new_top'] ? 0 : 1;
-
-    if ($reply === false) {
-        return $i;
-    }
-
-    while ($reply = hesk_dbFetchAssoc($result)) {
-        $color = 'class="ticketMessageContainer"';
-
-        $reply['dt'] = hesk_date($reply['dt'], true);
-        ?>
-        <div class="row ticketMessageContainer">
-            <div class="col-md-3 col-xs-12">
-                <div class="ticketName"><?php echo $reply['name']; ?></div>
-            </div>
-            <div class="col-md-9 col-xs-12 pushMarginLeft">
-                <div class="ticketMessageTop withBorder">
-                    <?php echo hesk_getAdminButtonsInTicket(); ?>
-                    <div class="blankSpace"></div>
-                    <p><?php echo $hesklang['date']; ?>: <?php echo $reply['dt']; ?></p>
+function mfh_print_message() {
+    global $ticket, $hesklang, $hesk_settings, $modsForHesk_settings;
+    ?>
+    <li><i class="fa fa-comment bg-red" data-toggle="tooltip" title="<?php echo $hesklang['original_message']; ?>"></i>
+        <div class="timeline-item">
+            <span class="time"><i class="fa fa-clock-o"></i> <?php echo $ticket['dt']; ?></span>
+            <h3 class="timeline-header"><?php echo $ticket['name']; ?></h3>
+            <div class="timeline-body">
+                <div class="row">
+                    <div class="col-md-3 text-right">
+                        <strong><?php echo $hesklang['m_sub']; ?></strong>
+                    </div>
+                    <div class="col-md-9">
+                        <?php echo $ticket['subject']; ?>
+                    </div>
                 </div>
-                <div class="ticketMessageBottom">
-                    <p><b><?php echo $hesklang['message']; ?>:</b></p>
-
-                    <p><?php if ($reply['html']) {
-                            echo hesk_html_entity_decode($reply['message']);
-                        } else {
-                            echo $reply['message'];
-                        } ?></p>
-                </div>
-                <div class="ticketMessageTop pushMargin">
-                    <?php mfh_listAttachments($reply['attachments'], $reply['id'], true);
-                    /* Staff rating */
-                    if ($hesk_settings['rating'] && $reply['staffid']) {
-                        if ($reply['rating'] == 1) {
-                            echo '<p class="rate">' . $hesklang['rnh'] . '</p>';
-                        } elseif ($reply['rating'] == 5) {
-                            echo '<p class="rate">' . $hesklang['rh'] . '</p>';
+                <?php foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                    if ($v['use'] && $v['place'] == 0) {
+                        if ($modsForHesk_settings['custom_field_setting']) {
+                            $v['name'] = $hesklang[$v['name']];
                         }
+                        echo '<div class="row">';
+                        echo '<div class="col-md-3 text-right"><strong>' . $v['name'] . ':</strong></div>';
+                        if ($v['type'] == 'date' && !empty($ticket[$k])) {
+                            $dt = hesk_date($ticket[$k], false, false);
+                            echo '<div class="col-md-9">' . hesk_dateToString($dt, 0) . '</div>';
+                        } else {
+                            echo '<div class="col-md-9">' . $ticket[$k] . '</div>';
+                        }
+                        echo '</div>';
                     }
+                }
+                ?>
+                <div class="row push-down-10">
+                    <div class="col-md-3 text-right">
+                        <strong><?php echo $hesklang['message_colon']; ?></strong>
+                    </div>
+                    <div class="col-md-9">
+                        <?php if ($ticket['html']) {
+                            echo hesk_html_entity_decode($ticket['message']);
+                        } else {
+                            echo $ticket['message'];
+                        } ?>
+                    </div>
+                </div>
+                <?php
+                foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                    if ($v['use'] && $v['place']) {
+                        if ($modsForHesk_settings['custom_field_setting']) {
+                            $v['name'] = $hesklang[$v['name']];
+                        }
+                        echo '<div class="row">';
+                        echo '<div class="col-md-3 text-right"><strong>' . $v['name'] . ':</strong></div>';
+                        if ($v['type'] == 'date' && !empty($ticket[$k])) {
+                            $dt = hesk_date($ticket[$k], false, false);
+                            echo '<div class="col-md-9">' . hesk_dateToString($dt, 0) . '</div>';
+                        } else {
+                            echo '<div class="col-md-9">' . $ticket[$k] . '</div>';
+                        }
+                        echo '</div>';
+                    }
+                }
+                ?>
+            </div>
+            <?php if (($hesk_settings['attachments']['use'] && strlen($ticket['attachments']))
+                || ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && strlen($ticket['articles']))): ?>
+                <div class="timeline-footer">
+                    <?php
+                    /* Attachments */
+                    mfh_listAttachments($ticket['attachments'], 0, true);
 
-                    /* Show "unread reply" message? */
-                    if ($reply['staffid'] && !$reply['read']) {
-                        echo '<p class="rate">' . $hesklang['unread'] . '</p>';
+                    // Show suggested KB articles
+                    if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && strlen($ticket['articles'])) {
+                        $suggested = array();
+                        $suggested_list = '';
+
+                        // Get article info from the database
+                        $articles = hesk_dbQuery("SELECT `id`,`subject` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "kb_articles` WHERE `id` IN (" . preg_replace('/[^0-9\,]/', '', $ticket['articles']) . ")");
+                        while ($article = hesk_dbFetchAssoc($articles)) {
+                            $suggested[$article['id']] = '<a href="../knowledgebase.php?article=' . $article['id'] . '">' . $article['subject'] . '</a><br />';
+                        }
+
+                        // Loop through the IDs to preserve the order they were suggested in
+                        $articles = explode(',', $ticket['articles']);
+                        foreach ($articles as $article) {
+                            if (isset($suggested[$article])) {
+                                $suggested_list .= $suggested[$article];
+                            }
+                        }
+
+                        // Finally print suggested articles
+                        if (strlen($suggested_list)) {
+                            $suggested_list = '<hr /><i>' . $hesklang['taws'] . '</i><br />' . $suggested_list . '&nbsp;';
+                            echo $_SESSION['show_suggested'] ? $suggested_list : '<a href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay(\'suggested_articles\')">' . $hesklang['sska'] . '</a><span id="suggested_articles" style="display:none">' . $suggested_list . '</span>';
+                        }
                     }
                     ?>
                 </div>
+            <?php endif; ?>
+            <div class="timeline-footer">
+                <div class="row">
+                    <div class="col-md-12 text-right">
+                        <?php echo hesk_getAdminButtonsInTicket(0); ?>
+                    </div>
+                </div>
             </div>
         </div>
+    </li>
+<?php
+}
+
+
+function hesk_printTicketReplies()
+{
+    global $hesklang, $hesk_settings, $result, $reply;
+
+    echo '<ul class="timeline">';
+    if (!$hesk_settings['new_top']) {
+        mfh_print_message();
+    } else {
+        echo '<li class="today-top"><i class="fa fa-clock-o bg-gray" data-toggle="tooltip" title="' . $hesklang['timeline_today'] . '"></i></li>';
+    }
+
+    while ($reply = hesk_dbFetchAssoc($result)) {
+        $reply['dt'] = hesk_date($reply['dt'], true);
+        ?>
+        <li>
+            <?php if ($reply['staffid']): ?>
+                <i class="fa fa-reply bg-orange" data-toggle="tooltip" title="<?php echo $hesklang['reply_by_staff']; ?>"></i>
+            <?php else: ?>
+                <i class="fa fa-share bg-blue" data-toggle="tooltip" title="<?php echo $hesklang['reply_by_customer']; ?>"></i>
+            <?php endif; ?>
+            <div class="timeline-item">
+                <span class="time"><i class="fa fa-clock-o"></i> <?php echo $reply['dt']; ?></span>
+                <h3 class="timeline-header"><?php echo $reply['name']; ?></h3>
+                <div class="timeline-body">
+                    <?php
+                    if ($reply['html']) {
+                        echo hesk_html_entity_decode($reply['message']);
+                    } else {
+                        echo $reply['message'];
+                    } ?>
+                </div>
+                <?php
+                if ($hesk_settings['attachments']['use'] && strlen($reply['attachments'])):
+                ?>
+                <div class="timeline-footer">
+                    <?php mfh_listAttachments($reply['attachments'], $reply['id'], true); ?>
+                </div>
+                <?php endif; ?>
+                <div class="timeline-footer">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <?php
+                            /* Staff rating */
+                            if ($hesk_settings['rating'] && $reply['staffid']) {
+                                if ($reply['rating'] == 1) {
+                                    echo '<p class="rate">' . $hesklang['rnh'] . '</p>';
+                                } elseif ($reply['rating'] == 5) {
+                                    echo '<p class="rate">' . $hesklang['rh'] . '</p>';
+                                }
+                            }
+                            /* Show "unread reply" message? */
+                            if ($reply['staffid'] && !$reply['read']) {
+                                echo '<p class="rate">' . $hesklang['unread'] . '</p>';
+                            }
+                            ?>
+                        </div>
+                        <div class="col-md-6 text-right">
+                            <?php echo hesk_getAdminButtonsInTicket(); ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </li>
         <?php
     }
 
-    return $i;
+    if ($hesk_settings['new_top']) {
+        mfh_print_message();
+    } else {
+        echo '<li><i class="fa fa-clock-o bg-gray" data-toggle="tooltip" title="' . $hesklang['timeline_today'] . '"></i></li>';
+    }
+    echo '</ul>';
+
+    return;
 
 } // End hesk_printTicketReplies()
 
@@ -1761,78 +1769,86 @@ function hesk_printReplyForm()
         });
         /* ]]> */
     </script>
-<?php endif; ?>
+    <?php endif; ?>
 
-    <h3 class="text-left"><?php echo $hesklang['add_reply']; ?></h3>
-    <div class="footerWithBorder"></div>
-    <div class="blankSpace"></div>
-
-    <?php
-    $onsubmit = 'onsubmit="force_stop();"';
-    if ($modsForHesk_settings['rich_text_for_tickets']) {
-        $onsubmit = 'onsubmit="force_stop();return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
-    }
-    ?>
-    <form role="form" data-toggle="validator" class="form-horizontal" method="post" action="admin_reply_ticket.php"
-          enctype="multipart/form-data" name="form1" <?php echo $onsubmit; ?>>
+<div class="box">
+    <div class="box-header with-border">
+        <h1 class="box-title">
+            <?php echo $hesklang['add_reply']; ?>
+        </h1>
+        <div class="box-tools pull-right">
+            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                <i class="fa fa-minus"></i>
+            </button>
+        </div>
+    </div>
+    <div class="box-body">
         <?php
-
-        /* Ticket assigned to someone else? */
-        if ($ticket['owner'] && $ticket['owner'] != $_SESSION['id'] && isset($admins[$ticket['owner']])) {
-            hesk_show_notice($hesklang['nyt'] . ' ' . $admins[$ticket['owner']]);
-        }
-
-        /* Ticket locked? */
-        if ($ticket['locked']) {
-            hesk_show_notice($hesklang['tislock']);
-        }
-
-        // Track time worked?
-        if ($hesk_settings['time_worked']) {
-            ?>
-
-            <div class="form-group">
-                <label for="time_worked" class="col-sm-3 control-label"><?php echo $hesklang['ts']; ?></label>
-
-                <div class="col-sm-6">
-                    <input type="text" class="form-control" name="time_worked" id="time_worked" size="10"
-                           value="<?php echo(isset($_SESSION['time_worked']) ? hesk_getTime($_SESSION['time_worked']) : '00:00:00'); ?>"/>
-                </div>
-                <div class="col-sm-3 text-right">
-                    <div class="btn-group">
-                        <input type="button" class="btn btn-success" onclick="ss()" id="startb"
-                               value="<?php echo $hesklang['start']; ?>"/>
-                        <input type="button" class="btn btn-danger" onclick="r()"
-                               value="<?php echo $hesklang['reset']; ?>"/>
-                    </div>
-                </div>
-            </div>
-            <?php
-        }
-        /* Do we have any canned responses? */
-        if (strlen($can_options)) {
-            ?>
-            <div class="form-group">
-                <label for="saved_replies" class="col-sm-3 control-label"><?php echo $hesklang['saved_replies']; ?></label>
-                <div class="col-sm-9">
-                    <label><input type="radio" name="mode" id="modeadd" value="1"
-                                  checked="checked"/> <?php echo $hesklang['madd']; ?></label><br/>
-                    <label><input type="radio" name="mode" id="moderep" value="0"/> <?php echo $hesklang['mrep']; ?>
-                    </label>
-                    <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
-                        <option value="0"> - <?php echo $hesklang['select_empty']; ?> -</option>
-                        <?php echo $can_options; ?>
-                    </select>
-                </div>
-            </div>
-            <?php
+        $onsubmit = 'onsubmit="force_stop();"';
+        if ($modsForHesk_settings['rich_text_for_tickets']) {
+            $onsubmit = 'onsubmit="force_stop();return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
         }
         ?>
-        <div class="form-group" id="message-group">
-            <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?><span
-                    class="important">*</span></label>
+        <form role="form" data-toggle="validator" class="form-horizontal" method="post" action="admin_reply_ticket.php"
+              enctype="multipart/form-data" name="form1" <?php echo $onsubmit; ?>>
+            <?php
 
-            <div class="col-sm-9">
+            /* Ticket assigned to someone else? */
+            if ($ticket['owner'] && $ticket['owner'] != $_SESSION['id'] && isset($admins[$ticket['owner']])) {
+                hesk_show_notice($hesklang['nyt'] . ' ' . $admins[$ticket['owner']]);
+            }
+
+            /* Ticket locked? */
+            if ($ticket['locked']) {
+                hesk_show_notice($hesklang['tislock']);
+            }
+
+            // Track time worked?
+            if ($hesk_settings['time_worked']) {
+                ?>
+
+                <div class="form-group">
+                    <label for="time_worked" class="col-sm-3 control-label"><?php echo $hesklang['ts']; ?></label>
+
+                    <div class="col-sm-6">
+                        <input type="text" class="form-control" name="time_worked" id="time_worked" size="10"
+                               value="<?php echo(isset($_SESSION['time_worked']) ? hesk_getTime($_SESSION['time_worked']) : '00:00:00'); ?>"/>
+                    </div>
+                    <div class="col-sm-3 text-right">
+                        <div class="btn-group">
+                            <input type="button" class="btn btn-success" onclick="ss()" id="startb"
+                                   value="<?php echo $hesklang['start']; ?>"/>
+                            <input type="button" class="btn btn-danger" onclick="r()"
+                                   value="<?php echo $hesklang['reset']; ?>"/>
+                        </div>
+                    </div>
+                </div>
+                <?php
+            }
+            /* Do we have any canned responses? */
+            if (strlen($can_options)) {
+                ?>
+                <div class="form-group">
+                    <label for="saved_replies" class="col-sm-3 control-label"><?php echo $hesklang['saved_replies']; ?></label>
+                    <div class="col-sm-9">
+                        <label><input type="radio" name="mode" id="modeadd" value="1"
+                                      checked="checked"/> <?php echo $hesklang['madd']; ?></label><br/>
+                        <label><input type="radio" name="mode" id="moderep" value="0"/> <?php echo $hesklang['mrep']; ?>
+                        </label>
+                        <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
+                            <option value="0"> - <?php echo $hesklang['select_empty']; ?> -</option>
+                            <?php echo $can_options; ?>
+                        </select>
+                    </div>
+                </div>
+                <?php
+            }
+            ?>
+            <div class="form-group" id="message-group">
+                <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?><span
+                        class="important">*</span></label>
+
+                <div class="col-sm-9">
                     <span id="HeskMsg">
                         <textarea class="form-control htmlEditor" name="message" id="message" rows="12"
                                   placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" cols="72"
@@ -1852,100 +1868,101 @@ function hesk_printReplyForm()
 
                             ?></textarea>
                         <div class="help-block with-errors" id="message-help-block"></div></span>
-            </div>
-        </div>
-        <?php
-        /* attachments */
-        if ($hesk_settings['attachments']['use']) {
-            ?>
-            <div class="form-group">
-                <label for="attachments" class="col-sm-3 control-label"><?php echo $hesklang['attachments']; ?>:</label>
-
-                <div class="col-sm-9">
-                    <?php build_dropzone_markup(true); ?>
                 </div>
             </div>
             <?php
-            display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
-        }
-        ?>
-        <div class="form-group">
-            <label for="options" class="col-sm-3 control-label"><?php echo $hesklang['addop']; ?>:</label>
-
-            <div class="col-sm-9">
-                <?php
-                if ($ticket['owner'] != $_SESSION['id'] && $can_assign_self) {
-                    if (empty($ticket['owner'])) {
-                        echo '<label><input type="checkbox" name="assign_self" value="1" checked="checked" /> <b>' . $hesklang['asss2'] . '</b></label><br />';
-                    } else {
-                        echo '<label><input type="checkbox" name="assign_self" value="1" /> ' . $hesklang['asss2'] . '</label><br />';
-                    }
-                }
-
+            /* attachments */
+            if ($hesk_settings['attachments']['use']) {
                 ?>
-                <div class="form-inline">
-                    <label>
-                        <input type="checkbox" name="set_priority"
-                               value="1"/> <?php echo $hesklang['change_priority']; ?>
-                    </label>
-                    <select class="form-control" name="priority">
-                        <?php echo implode('', $options); ?>
-                    </select>
-                </div>
-                <br/>
-                <label>
-                    <input type="checkbox" name="signature" value="1"
-                           checked="checked"/> <?php echo $hesklang['attach_sign']; ?>
-                </label>
-                (<a href="profile.php"><?php echo $hesklang['profile_settings']; ?></a>)
-                <br/>
-                <label>
-                    <input type="checkbox" name="no_notify"
-                           value="1" <?php echo ($_SESSION['notify_customer_reply'] && !empty($ticket['email'])) ? '' : 'checked="checked" '; ?> <?php if (empty($ticket['email'])) {
-                        echo 'disabled';
-                    } ?>> <?php echo $hesklang['dsen']; ?>
-                </label><br/><br/>
-                <?php if (empty($ticket['email'])) {
-                    echo '<input type="hidden" name="no_notify" value="1">';
-                } ?>
-                <input type="hidden" name="orig_id" value="<?php echo $ticket['id']; ?>"/>
-                <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                <div class="form-group">
+                    <label for="attachments" class="col-sm-3 control-label"><?php echo $hesklang['attachments']; ?>:</label>
 
-                <div class="btn-group">
-                    <input class="btn btn-primary" type="submit" value="<?php echo $hesklang['submit_reply']; ?>">
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
-                            aria-expanded="false">
-                        <span class="caret"></span>
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu">
-                        <li><a>
-                                <button class="dropdown-submit" type="submit" name="submit_as_customer">
-                                    <?php echo $hesklang['sasc']; ?>
-                                </button>
-                            </a></li>
-                        <li class="divider"></li>
-                        <?php
-                        $statuses = mfh_getAllStatuses();
-                        foreach ($statuses as $status) {
-                            echo '<li><a>
+                    <div class="col-sm-9">
+                        <?php build_dropzone_markup(true); ?>
+                    </div>
+                </div>
+                <?php
+                display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+            }
+            ?>
+            <div class="form-group">
+                <label for="options" class="col-sm-3 control-label"><?php echo $hesklang['addop']; ?>:</label>
+
+                <div class="col-sm-9">
+                    <?php
+                    if ($ticket['owner'] != $_SESSION['id'] && $can_assign_self) {
+                        if (empty($ticket['owner'])) {
+                            echo '<label><input type="checkbox" name="assign_self" value="1" checked="checked" /> <b>' . $hesklang['asss2'] . '</b></label><br />';
+                        } else {
+                            echo '<label><input type="checkbox" name="assign_self" value="1" /> ' . $hesklang['asss2'] . '</label><br />';
+                        }
+                    }
+
+                    ?>
+                    <div class="form-inline">
+                        <label>
+                            <input type="checkbox" name="set_priority"
+                                   value="1"/> <?php echo $hesklang['change_priority']; ?>
+                        </label>
+                        <select class="form-control" name="priority">
+                            <?php echo implode('', $options); ?>
+                        </select>
+                    </div>
+                    <br/>
+                    <label>
+                        <input type="checkbox" name="signature" value="1"
+                               checked="checked"/> <?php echo $hesklang['attach_sign']; ?>
+                    </label>
+                    (<a href="profile.php"><?php echo $hesklang['profile_settings']; ?></a>)
+                    <br/>
+                    <label>
+                        <input type="checkbox" name="no_notify"
+                               value="1" <?php echo ($_SESSION['notify_customer_reply'] && !empty($ticket['email'])) ? '' : 'checked="checked" '; ?> <?php if (empty($ticket['email'])) {
+                            echo 'disabled';
+                        } ?>> <?php echo $hesklang['dsen']; ?>
+                    </label><br/><br/>
+                    <?php if (empty($ticket['email'])) {
+                        echo '<input type="hidden" name="no_notify" value="1">';
+                    } ?>
+                    <input type="hidden" name="orig_id" value="<?php echo $ticket['id']; ?>"/>
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+
+                    <div class="btn-group">
+                        <input class="btn btn-primary" type="submit" value="<?php echo $hesklang['submit_reply']; ?>">
+                        <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
+                                aria-expanded="false">
+                            <span class="caret"></span>
+                            <span class="sr-only">Toggle Dropdown</span>
+                        </button>
+                        <ul class="dropdown-menu" role="menu">
+                            <li><a>
+                                    <button class="dropdown-submit" type="submit" name="submit_as_customer">
+                                        <?php echo $hesklang['sasc']; ?>
+                                    </button>
+                                </a></li>
+                            <li class="divider"></li>
+                            <?php
+                            $statuses = mfh_getAllStatuses();
+                            foreach ($statuses as $status) {
+                                echo '<li><a>
                                         <button class="dropdown-submit" type="submit" name="submit_as_status" value="' . $status['ID'] . '"">
                                             ' . $hesklang['submit_reply'] . ' ' . $hesklang['and_change_status_to'] . ' <b>
                                             <span style="color:' . $status['TextColor'] . '">' . mfh_getDisplayTextForStatusId($status['ID']) . '</span></b>
                                         </button>
                                     </a></li>';
-                        }
-                        ?>
-                    </ul>
+                            }
+                            ?>
+                        </ul>
+                    </div>
+                    <input class="btn btn-default" type="submit" name="save_reply" value="<?php echo $hesklang['sacl']; ?>">
+                    <?php if ($isManager): ?>
+                        <input type="hidden" name="isManager" value="1">
+                    <?php endif; ?>
                 </div>
-                <input class="btn btn-default" type="submit" name="save_reply" value="<?php echo $hesklang['sacl']; ?>">
-                <?php if ($isManager): ?>
-                    <input type="hidden" name="isManager" value="1">
-                <?php endif; ?>
             </div>
-        </div>
-    </form>
-
+        </form>
+    </div>
+</div>
     <!-- END REPLY FORM -->
     <?php
 } // End hesk_printReplyForm()
@@ -2071,4 +2088,52 @@ function hesk_printCanned()
     return $can_options;
 
 } // End hesk_printCanned()
+
+function buildUserAgentModal($user_agent, $width, $height) {
+    global $hesklang;
+
+    echo '
+    <div id="user-agent-modal" class="modal fade" tabindex="-1" role="dialog"
+             aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4>' . $hesklang['device_information'] . '</h4>
+                    </div>
+                    <div class="modal-body">
+                        <script>
+                            var userAgent = platform.parse(\'' . addslashes($user_agent) . '\');
+                            console.log(userAgent);
+                            var screenResWidth = ' . intval($width) . ';
+                            var screenResHeight = ' . intval($height) . ';
+                        </script>
+                        <table class="table table-striped">
+                            <tbody>
+                            <tr>
+                                <td><strong>' . $hesklang['operating_system'] . '</strong>
+                                </td>
+                                <td id="operating-system">&nbsp;</td>
+                                <script>$(\'#operating-system\').html(userAgent.os.toString());</script>
+                            </tr>
+                            <tr>
+                                <td><strong>' . $hesklang['browser'] . '</strong></td>
+                                <td id="browser">&nbsp;</td>
+                                <script>$(\'#browser\').html(userAgent.name + \' \' + userAgent.version);</script>
+                            </tr>
+                            <tr>
+                                <td><strong>' . $hesklang['screen_resolution'] . '</strong>
+                                </td>
+                                <td id="screen-resolution">&nbsp;</td>
+                                <script>$(\'#screen-resolution\').html(screenResWidth + \' x \' + screenResHeight);</script>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>';
+}
 ?>
diff --git a/admin/api_settings.php b/admin/api_settings.php
index 61a14abc..2bdc36b7 100644
--- a/admin/api_settings.php
+++ b/admin/api_settings.php
@@ -41,6 +41,7 @@ if (is_dir(HESK_PATH . 'install')) {
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -60,86 +61,103 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 // Print main manage users page
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row move-down-20">
-    <div class="col-sm-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                API Information
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['api_information']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
+        </div>
+        <div class="box-body">
             <table class="table table-striped table-fixed">
                 <tr>
                     <td class="text-right">
-                        API Version
+                        <?php echo $hesklang['api_version']; ?>
                     </td>
-                    <td class="pad-right-10 warning">
+                    <td class="warning">
                         <?php echo $hesklang['beta_text']; ?>
                     </td>
                 </tr>
                 <tr>
                     <td class="text-right">
-                        External API
+                        <?php echo $hesklang['external_api']; ?>
                     </td>
-                    <td class="pad-right-10 success" id="public-api-sidebar">
+                    <td class="success" id="public-api-sidebar">
                         <?php
                         $enabled = $modsForHesk_settings['public_api'] == '1' ? '' : 'hide';
                         $disabled = $modsForHesk_settings['public_api'] == '1' ? 'hide' : '';
                         ?>
-                        <span id="public-api-sidebar-disabled" class="<?php echo $disabled; ?>">Disabled</span>
-                        <span id="public-api-sidebar-enabled"  class="<?php echo $enabled; ?>">Enabled</span>
+                        <span id="public-api-sidebar-disabled" class="<?php echo $disabled; ?>">
+                            <?php echo $hesklang['disabled_title_case']; ?>
+                        </span>
+                        <span id="public-api-sidebar-enabled"  class="<?php echo $enabled; ?>">
+                            <?php echo $hesklang['enabled_title_case']; ?>
+                        </span>
                     </td>
                 </tr>
             </table>
         </div>
     </div>
-    <div class="col-sm-8">
-        <h3>API Settings</h3>
-        <div class="footerWithBorder blankSpace"></div>
-        <ul class="nav nav-tabs">
-            <li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li>
-            <li><a href="#user-security" data-toggle="tab">User Security</a></li>
-            <li><a href="#" target="_blank">API Documentation <i class="fa fa-external-link"></i></a></li>
-        </ul>
-        <div class="tab-content summaryList tabPadding">
-            <div class="tab-pane fade in active" id="general">
-                <form class="form-horizontal">
-                    <div class="form-group">
-                        <label for="public-api" class="col-sm-3 control-label">
-                            Public API
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                title="Public API"
-                                data-content="Enable or Disable the Public REST API."></i>
-                        </label>
-                        <div class="col-sm-9">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['api_settings']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body nav-tabs-custom">
+            <ul class="nav nav-tabs">
+                <li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li>
+                <li><a href="#user-security" data-toggle="tab"><?php echo $hesklang['user_security']; ?></a></li>
+                <li><a href="#" target="_blank"><?php echo $hesklang['api_documentation']; ?> <i class="fa fa-external-link"></i></a></li>
+            </ul>
+            <div class="tab-content summaryList tabPadding">
+                <div class="tab-pane fade in active" id="general">
+                    <form class="form-horizontal">
+                        <div class="form-group">
+                            <label for="public-api" class="col-sm-3 control-label">
+                                <?php echo $hesklang['external_api']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   title="<?php echo $hesklang['external_api']; ?>"
+                                   data-content="<?php echo $hesklang['external_api_help']; ?>"></i>
+                            </label>
+                            <div class="col-sm-9">
                             <span class="btn-group" data-toggle="buttons">
                                 <?php
                                 $on = $modsForHesk_settings['public_api'] == '1' ? 'active' : '';
                                 $off = $modsForHesk_settings['public_api'] == '1' ? '' : 'active';
                                 ?>
                                 <label id="enable-api-button" class="btn btn-success <?php echo $on; ?>">
-                                    <input type="radio" name="public-api" value="1" checked> <i class="fa fa-check-circle"></i> Enable
+                                    <input type="radio" name="public-api" value="1"> <i class="fa fa-check-circle"></i>
+                                    <?php echo $hesklang['enable']; ?>
                                 </label>
                                 <label id="disable-api-button" class="btn btn-danger <?php echo $off; ?>">
-                                    <input type="radio" name="public-api" value="0"> <i class="fa fa-times-circle"></i> Disable
+                                    <input type="radio" name="public-api" value="0"> <i class="fa fa-times-circle"></i>
+                                    <?php echo $hesklang['disable']; ?>
                                 </label>
                             </span>
                             <span>
                                 <i id="public-api-success" class="fa fa-check-circle fa-2x green hide media-middle"
-                                    data-toggle="tooltip" title="Changes saved!"></i>
+                                   data-toggle="tooltip" title="<?php echo $hesklang['changes_saved']; ?>"></i>
                                 <i id="public-api-failure" class="fa fa-times-circle fa-2x red hide media-middle"
-                                    data-toggle="tooltip" title="Saving changes failed. Check the logs for more information."></i>
+                                   data-toggle="tooltip" title="<?php echo $hesklang['save_failed_check_logs']; ?>"></i>
                                 <i id="public-api-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle"
-                                    data-toggle="tooltip" title="Saving..."></i>
+                                   data-toggle="tooltip" title="<?php echo $hesklang['saving']; ?>"></i>
                             </span>
+                            </div>
                         </div>
-                    </div>
-                </form>
-            </div>
-            <div class="tab-pane fade in" id="user-security">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        User Security
-                    </div>
+                    </form>
+                </div>
+                <div class="tab-pane fade in" id="user-security">
                     <?php
                     $users = array();
                     $userRs = hesk_dbQuery("SELECT `id`, `user`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'");
@@ -155,51 +173,53 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     <table class="table table-striped">
                         <thead>
                         <tr>
-                            <th>Username</th>
-                            <th>Name</th>
-                            <th>Number of Tokens</th>
-                            <th>Actions</th>
+                            <th><?php echo $hesklang['username']; ?></th>
+                            <th><?php echo $hesklang['name']; ?></th>
+                            <th><?php echo $hesklang['number_of_tokens']; ?></th>
+                            <th><?php echo $hesklang['actions']; ?></th>
                         </tr>
                         </thead>
                         <tbody>
                         <?php
                         foreach ($users as $row):
-                        ?>
-                        <tr>
-                            <td><?php echo $row['user']; ?></td>
-                            <td><?php echo $row['name']; ?></td>
-                            <td id="token-<?php echo $row['id']; ?>-count"><?php echo $row['number_of_tokens']; ?></td>
-                            <td>
+                            ?>
+                            <tr>
+                                <td><?php echo $row['user']; ?></td>
+                                <td><?php echo $row['name']; ?></td>
+                                <td id="token-<?php echo $row['id']; ?>-count"><?php echo $row['number_of_tokens']; ?></td>
+                                <td>
                                 <span class="btn-group">
                                     <button class="btn btn-default btn-xs" onclick="generateToken(<?php echo $row['id']; ?>)">
-                                        <i class="fa fa-plus-circle"></i> Generate New Token
+                                        <i class="fa fa-plus-circle"></i>
+                                        <?php echo $hesklang['generate_new_token']; ?>
                                     </button>
                                     <button class="btn btn-danger btn-xs" onclick="clearTokens(<?php echo $row['id']; ?>)">
-                                        <i class="fa fa-undo"></i> Reset Tokens
+                                        <i class="fa fa-times"></i>
+                                        <?php echo $hesklang['revoke_all_tokens']; ?>
                                     </button>
                                 </span>
                                 <span>
                                     <i id="token-<?php echo $row['id']; ?>-success" class="fa fa-check-circle fa-2x green hide media-middle"
-                                       data-toggle="tooltip" title="Changes saved!"></i>
+                                       data-toggle="tooltip" title="<?php echo $hesklang['changes_saved']; ?>"></i>
                                     <i id="token-<?php echo $row['id']; ?>-failure" class="fa fa-times-circle fa-2x red hide media-middle"
-                                       data-toggle="tooltip" title="Saving changes failed. Check the logs for more information."></i>
+                                       data-toggle="tooltip" title="<?php echo $hesklang['save_failed_check_logs']; ?>"></i>
                                     <i id="token-<?php echo $row['id']; ?>-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle"
-                                       data-toggle="tooltip" title="Saving..."></i>
+                                       data-toggle="tooltip" title="<?php echo $hesklang['saving']; ?>"></i>
                                 </span>
-                            </td>
-                        </tr>
-                        <tr id="token-<?php echo $row['id']; ?>-created" class="success hide">
-                            <td colspan="4">
-                                Generated Token: <code class="token"></code>
-                                <p><b>NOTE:</b> Please record this token, as this is the only time you will be able to view it!</p>
-                            </td>
-                        </tr>
-                        <tr id="token-<?php echo $row['id']; ?>-reset" class="success hide">
-                            <td colspan="4">
-                                <p>All tokens for this user have been removed!</p>
-                            </td>
-                        </tr>
-                        <?php
+                                </td>
+                            </tr>
+                            <tr id="token-<?php echo $row['id']; ?>-created" class="success hide">
+                                <td colspan="4">
+                                    <?php echo $hesklang['generated_token_colon']; ?> <code class="token"></code>
+                                    <p><b><?php echo $hesklang['record_this_token_warning']; ?></b></p>
+                                </td>
+                            </tr>
+                            <tr id="token-<?php echo $row['id']; ?>-reset" class="success hide">
+                                <td colspan="4">
+                                    <p><?php echo $hesklang['all_tokens_revoked']; ?></p>
+                                </td>
+                            </tr>
+                            <?php
                         endforeach;
                         ?>
                         </tbody>
@@ -208,7 +228,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </div>
         </div>
     </div>
+</section>
 
-    <?php
-    require_once(HESK_PATH . 'inc/footer.inc.php');
-    exit();
\ No newline at end of file
+<?php
+require_once(HESK_PATH . 'inc/footer.inc.php');
+exit();
\ No newline at end of file
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index e44bf575..b1078e61 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -66,175 +67,184 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row pad-down-20">
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#"><?php echo $hesklang['banemail']; ?> <i class="fa fa-question-circle settingsquestionmark"
-                                                                onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['banemail_intro']); ?>')"></i></a>
-        </li>
-        <?php
-        // Show a link to banned_ips.php if user has permission to do so
-        if (hesk_checkPermission('can_ban_ips', 0)) {
-            echo '
+<section class="content">
+    <div class="box">
+        <div class="box-body">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="active">
+                        <a href="#"><?php echo $hesklang['banemail']; ?> <i class="fa fa-question-circle settingsquestionmark"
+                                                                            onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['banemail_intro']); ?>')"></i></a>
+                    </li>
+                    <?php
+                    // Show a link to banned_ips.php if user has permission to do so
+                    if (hesk_checkPermission('can_ban_ips', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banip'] . '" href="banned_ips.php">' . $hesklang['banip'] . '</a>
             </li>';
-        }
-        // Show a link to status_message.php if user has permission to do so
-        if (hesk_checkPermission('can_service_msg', 0)) {
-            echo '
+                    }
+                    // Show a link to status_message.php if user has permission to do so
+                    if (hesk_checkPermission('can_service_msg', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['sm_title'] . '" href="service_messages.php">' . $hesklang['sm_title'] . '</a>
             </li>';
-        }
+                    }
 
-        // Show a link to email tpl management if user has permission to do so
-        if (hesk_checkPermission('can_man_email_tpl', 0)) {
-            echo '
+                    // Show a link to email tpl management if user has permission to do so
+                    if (hesk_checkPermission('can_man_email_tpl', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['email_templates'] . '" href="manage_email_templates.php">' . $hesklang['email_templates'] . '</a>
             </li>
             ';
-        }
-        if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-            echo '
+                    }
+                    if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['statuses'] . '" href="manage_statuses.php">' . $hesklang['statuses'] . '</a>
             </li>
             ';
-        }
-        ?>
-    </ul>
-    <div class="tab-content summaryList tabPadding">
-        <script language="javascript" type="text/javascript"><!--
-            function confirm_delete() {
-                if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }
-            //-->
-        </script>
-        <div class="row">
-            <div class="col-md-8">
-                <br><br>
-                <?php
-                /* This will handle error, success and notice messages */
-                hesk_handle_messages();
-                ?>
-                <form action="banned_emails.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
-                    <div class="form-group">
-                        <label for="text" class="col-sm-3 control-label"><?php echo $hesklang['bananemail']; ?></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="email" size="30" maxlength="255" data-error="<?php echo htmlspecialchars($hesklang['enterbanemail']); ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>" required>
-                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                            <input type="hidden" name="a" value="ban"/>
-                            <div class="help-block with-errors"></div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-9 col-sm-offset-3">
-                            <input type="submit" value="<?php echo $hesklang['savebanemail']; ?>"
-                                   class="btn btn-default">
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="col-md-4">
-                <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
-
-                <div class="footerWithBorder blankSpace"></div>
-                <b>john@email.com</b><br/>
-                <b>@domain.com</b>
-            </div>
-        </div>
-        <div class="row">
-            <?php
-
-            // Get banned emails from database
-            $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_emails` ORDER BY `email` ASC');
-            $num = hesk_dbNumRows($res);
-
-            echo '<h4>' . $hesklang['eperm'] . '</h4>';
-            if ($num < 1) {
-                echo '<p>' . $hesklang['no_banemails'] . '</p>';
-            } else {
-                // List of staff
-                if (!isset($admins)) {
-                    $admins = array();
-                    $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
-                    while ($row = hesk_dbFetchAssoc($res2)) {
-                        $admins[$row['id']] = $row['name'];
                     }
-                }
-
-                ?>
-                <table class="table table-hover">
-                    <thead>
-                    <tr>
-                        <th><?php echo $hesklang['email']; ?></th>
-                        <th><?php echo $hesklang['banby']; ?></th>
-                        <th><?php echo $hesklang['date']; ?></th>
-                        <?php
-                        if ($can_unban) {
-                            ?>
-                            <th><?php echo $hesklang['opt']; ?></th>
+                    ?>
+                </ul>
+                <div class="tab-content summaryList tabPadding">
+                    <script language="javascript" type="text/javascript"><!--
+                        function confirm_delete() {
+                            if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
+                        }
+                        //-->
+                    </script>
+                    <div class="row">
+                        <div class="col-md-8">
+                            <br><br>
                             <?php
-                        }
-                        ?>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-                    while ($ban = hesk_dbFetchAssoc($res)) {
-                        $color = '';
-                        if (isset($_SESSION['ban_email']['id']) && $ban['id'] == $_SESSION['ban_email']['id']) {
-                            $color = 'success';
-                            unset($_SESSION['ban_email']['id']);
-                        }
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
+                            ?>
+                            <form action="banned_emails.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
+                                <div class="form-group">
+                                    <label for="text" class="col-sm-3 control-label"><?php echo $hesklang['bananemail']; ?></label>
 
-                        echo '
+                                    <div class="col-sm-9">
+                                        <input type="text" class="form-control" name="email" size="30" maxlength="255" data-error="<?php echo htmlspecialchars($hesklang['enterbanemail']); ?>"
+                                               placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>" required>
+                                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                                        <input type="hidden" name="a" value="ban"/>
+                                        <div class="help-block with-errors"></div>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <div class="col-sm-9 col-sm-offset-3">
+                                        <input type="submit" value="<?php echo $hesklang['savebanemail']; ?>"
+                                               class="btn btn-default">
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="col-md-4">
+                            <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
+
+                            <div class="footerWithBorder blankSpace"></div>
+                            <b>john@email.com</b><br/>
+                            <b>@domain.com</b>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-12">
+                        <?php
+
+                        // Get banned emails from database
+                        $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_emails` ORDER BY `email` ASC');
+                        $num = hesk_dbNumRows($res);
+
+                        echo '<h4>' . $hesklang['eperm'] . '</h4>';
+                        if ($num < 1) {
+                            echo '<p>' . $hesklang['no_banemails'] . '</p>';
+                        } else {
+                            // List of staff
+                            if (!isset($admins)) {
+                                $admins = array();
+                                $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
+                                while ($row = hesk_dbFetchAssoc($res2)) {
+                                    $admins[$row['id']] = $row['name'];
+                                }
+                            }
+
+                            ?>
+                            <table class="table table-hover">
+                                <thead>
+                                <tr>
+                                    <th><?php echo $hesklang['email']; ?></th>
+                                    <th><?php echo $hesklang['banby']; ?></th>
+                                    <th><?php echo $hesklang['date']; ?></th>
+                                    <?php
+                                    if ($can_unban) {
+                                        ?>
+                                        <th><?php echo $hesklang['opt']; ?></th>
+                                        <?php
+                                    }
+                                    ?>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php
+                                while ($ban = hesk_dbFetchAssoc($res)) {
+                                    $color = '';
+                                    if (isset($_SESSION['ban_email']['id']) && $ban['id'] == $_SESSION['ban_email']['id']) {
+                                        $color = 'success';
+                                        unset($_SESSION['ban_email']['id']);
+                                    }
+
+                                    echo '
                         <tr>
                             <td class="' . $color . ' text-left">' . $ban['email'] . '</td>
                             <td class="' . $color . ' text-left">' . (isset($admins[$ban['banned_by']]) ? $admins[$ban['banned_by']] : $hesklang['e_udel']) . '</td>
                             <td class="' . $color . ' text-left">' . $ban['dt'] . '</td>
                             ';
 
-                        if ($can_unban) {
-                            echo '
+                                    if ($can_unban) {
+                                        echo '
                             <td class="' . $color . ' text-left">
                                 <a href="banned_emails.php?a=unban&amp;id=' . $ban['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();">
                                     <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delban'] . '"></i>
                                 </a>
                             </td>
                             ';
+                                    }
+
+                                    echo '</tr>';
+                                } // End while
+                                ?>
+                                </tbody>
+                            </table>
+                            <div align="center">
+                                <table border="0" cellspacing="1" cellpadding="3" class="white" width="100%">
+                                    <?php
+
+
+                                    ?>
+                                </table>
+                            </div>
+                            <?php
                         }
 
-                        echo '</tr>';
-                    } // End while
-                    ?>
-                    </tbody>
-                </table>
-                <div align="center">
-                    <table border="0" cellspacing="1" cellpadding="3" class="white" width="100%">
-                        <?php
-
-
                         ?>
-                    </table>
+                        </div>
+                    </div>
                 </div>
-                <?php
-            }
-
-            ?>
+            </div>
         </div>
     </div>
-</div>
+</section>
+
+
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/banned_ips.php b/admin/banned_ips.php
index 40c99ecf..d6af3c60 100644
--- a/admin/banned_ips.php
+++ b/admin/banned_ips.php
@@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -68,131 +69,134 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row pad-20">
-    <ul class="nav nav-tabs" role="tablist">
-        <?php
-        // Show a link to banned_emails.php if user has permission to do so
-        if (hesk_checkPermission('can_ban_emails', 0)) {
-            echo '
+<section class="content">
+    <div class="box">
+        <div class="box-body">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs" role="tablist">
+                    <?php
+                    // Show a link to banned_emails.php if user has permission to do so
+                    if (hesk_checkPermission('can_ban_emails', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banemail'] . '" href="banned_emails.php">' . $hesklang['banemail'] . '</a>
             </li>';
-        }
-        ?>
-        <li role="presentation" class="active">
-            <a href="#"><?php echo $hesklang['banip']; ?> <i class="fa fa-question-circle settingsquestionmark"
-                                                             onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['banip_intro']); ?>')"></i></a>
-        </li>
-        <?php
-        // Show a link to status_message.php if user has permission to do so
-        if (hesk_checkPermission('can_service_msg', 0)) {
-            echo '
+                    }
+                    ?>
+                    <li role="presentation" class="active">
+                        <a href="#"><?php echo $hesklang['banip']; ?> <i class="fa fa-question-circle settingsquestionmark"
+                                                                         onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['banip_intro']); ?>')"></i></a>
+                    </li>
+                    <?php
+                    // Show a link to status_message.php if user has permission to do so
+                    if (hesk_checkPermission('can_service_msg', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['sm_title'] . '" href="service_messages.php">' . $hesklang['sm_title'] . '</a>
             </li>';
-        }
+                    }
 
-        // Show a link to email tpl management if user has permission to do so
-        if (hesk_checkPermission('can_man_email_tpl', 0)) {
-            echo '
+                    // Show a link to email tpl management if user has permission to do so
+                    if (hesk_checkPermission('can_man_email_tpl', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['email_templates'] . '" href="manage_email_templates.php">' . $hesklang['email_templates'] . '</a>
             </li>
             ';
-        }
-        if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-            echo '
+                    }
+                    if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['statuses'] . '" href="manage_statuses.php">' . $hesklang['statuses'] . '</a>
             </li>
             ';
-        }
-        ?>
-    </ul>
-    <div class="tab-content summaryList tabPadding">
-        <script language="javascript" type="text/javascript"><!--
-            function confirm_delete() {
-                if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }
-            //-->
-        </script>
-        <div class="row">
-            <div class="col-md-8">
-                <?php
-                /* This will handle error, success and notice messages */
-                hesk_handle_messages();
-                ?>
-                <form action="banned_ips.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
-                    <div class="form-group">
-                        <label for="ip" class="col-sm-3 control-label"><?php echo $hesklang['bananip']; ?></label>
-
-                        <div class="col-sm-9">
-                            <input type="text" name="ip" size="30" maxlength="255" class="form-control" data-error="<?php echo htmlspecialchars($hesklang['enterbanip']); ?>"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['iprange']); ?>" required>
-                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                            <input type="hidden" name="a" value="ban"/>
-                            <div class="help-block with-errors"></div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-9 col-sm-offset-3">
-                            <input type="submit" value="<?php echo $hesklang['savebanip']; ?>" class="btn btn-default">
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="col-md-4">
-                <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
-
-                <div class="footerWithBorder blankSpace"></div>
-                <b>123.0.0.0</b><br/>
-                <b>123.0.0.1 - 123.0.0.53</b><br/>
-                <b>123.0.0.0/24</b><br/>
-                <b>123.0.*.*</b>
-            </div>
-        </div>
-        <div class="row">
-            <?php
-
-            // Get login failures
-            $res = hesk_dbQuery("SELECT `ip`, TIMESTAMPDIFF(MINUTE, NOW(), DATE_ADD(`last_attempt`, INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE) ) AS `minutes` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` WHERE `number` >= " . intval($hesk_settings['attempt_limit']) . " AND `last_attempt` > (NOW() -  INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE)");
-            $num = hesk_dbNumRows($res);
-
-            echo '<h4>' . $hesklang['iptemp'] . '</h4>';
-
-            if ($num > 0) {
-                ?>
-                <table class="table table-hover">
-                    <thead>
-                    <tr>
-                        <th><?php echo $hesklang['ip']; ?></th>
-                        <th><?php echo $hesklang['m2e']; ?></th>
-                        <?php
-                        if ($can_unban) {
-                            ?>
-                            <th><?php echo $hesklang['opt']; ?></th>
-                            <?php
+                    }
+                    ?>
+                </ul>
+                <div class="tab-content summaryList tabPadding">
+                    <script language="javascript" type="text/javascript"><!--
+                        function confirm_delete() {
+                            if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
                         }
-                        ?>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-                    while ($ban = hesk_dbFetchAssoc($res)) {
-                        echo '
+                        //-->
+                    </script>
+                    <div class="row">
+                        <div class="col-md-8">
+                            <?php
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
+                            ?>
+                            <form action="banned_ips.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
+                                <div class="form-group">
+                                    <label for="ip" class="col-sm-3 control-label"><?php echo $hesklang['bananip']; ?></label>
+
+                                    <div class="col-sm-9">
+                                        <input type="text" name="ip" size="30" maxlength="255" class="form-control" data-error="<?php echo htmlspecialchars($hesklang['enterbanip']); ?>"
+                                               placeholder="<?php echo htmlspecialchars($hesklang['iprange']); ?>" required>
+                                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                                        <input type="hidden" name="a" value="ban"/>
+                                        <div class="help-block with-errors"></div>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <div class="col-sm-9 col-sm-offset-3">
+                                        <input type="submit" value="<?php echo $hesklang['savebanip']; ?>" class="btn btn-default">
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="col-md-4">
+                            <h6 class="bold"><?php echo $hesklang['banex']; ?></h6>
+
+                            <div class="footerWithBorder blankSpace"></div>
+                            <b>123.0.0.0</b><br/>
+                            <b>123.0.0.1 - 123.0.0.53</b><br/>
+                            <b>123.0.0.0/24</b><br/>
+                            <b>123.0.*.*</b>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-12">
+                        <?php
+
+                        // Get login failures
+                        $res = hesk_dbQuery("SELECT `ip`, TIMESTAMPDIFF(MINUTE, NOW(), DATE_ADD(`last_attempt`, INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE) ) AS `minutes` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` WHERE `number` >= " . intval($hesk_settings['attempt_limit']) . " AND `last_attempt` > (NOW() -  INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE)");
+                        $num = hesk_dbNumRows($res);
+
+                        echo '<h4>' . $hesklang['iptemp'] . '</h4>';
+
+                        if ($num > 0) {
+                            ?>
+                            <table class="table table-hover">
+                                <thead>
+                                <tr>
+                                    <th><?php echo $hesklang['ip']; ?></th>
+                                    <th><?php echo $hesklang['m2e']; ?></th>
+                                    <?php
+                                    if ($can_unban) {
+                                        ?>
+                                        <th><?php echo $hesklang['opt']; ?></th>
+                                        <?php
+                                    }
+                                    ?>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php
+                                while ($ban = hesk_dbFetchAssoc($res)) {
+                                    echo '
                                     <tr>
                                     <td>' . $ban['ip'] . '</td>
                                     <td>' . $ban['minutes'] . '</td>
                                 ';
 
-                        if ($can_unban) {
-                            echo '
+                                    if ($can_unban) {
+                                        echo '
                                     <td>
                                         <a href="banned_ips.php?a=ban&amp;ip=' . urlencode($ban['ip']) . '&amp;token=' . hesk_token_echo(0) . '">
                                             <i class="fa fa-ban red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['ippermban'] . '"></i></a>
@@ -200,64 +204,64 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delban'] . '"></i></a>
                                     </td>
                                     ';
-                        }
+                                    }
 
-                        echo '</tr>';
-                    } // End while
+                                    echo '</tr>';
+                                } // End while
 
-                    ?>
-                    </tbody>
-                </table>
-                <?php
-            } else {
-                echo '<p>' . $hesklang['no_banips'] . '</p>';
-            }
-
-            // Get banned ips from database
-            $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_ips` ORDER BY `ip_from` ASC');
-            $num = hesk_dbNumRows($res);
-
-            echo '<br><h4>' . $hesklang['ipperm'] . '</h4>';
-
-            if ($num < 1) {
-                echo '<p>' . $hesklang['no_banips'] . '</p>';
-            } else {
-                // List of staff
-                if (!isset($admins)) {
-                    $admins = array();
-                    $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
-                    while ($row = hesk_dbFetchAssoc($res2)) {
-                        $admins[$row['id']] = $row['name'];
-                    }
-                }
-
-                ?>
-                <table class="table table-hover">
-                    <thead>
-                    <tr>
-                        <th><?php echo $hesklang['ip']; ?></th>
-                        <th><?php echo $hesklang['iprange']; ?></th>
-                        <th><?php echo $hesklang['banby']; ?></th>
-                        <th><?php echo $hesklang['date']; ?></th>
-                        <?php
-                        if ($can_unban) {
-                            ?>
-                            <th><?php echo $hesklang['opt']; ?></th>
+                                ?>
+                                </tbody>
+                            </table>
                             <?php
-                        }
-                        ?>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-                    while ($ban = hesk_dbFetchAssoc($res)) {
-                        $color = '';
-                        if (isset($_SESSION['ban_ip']['id']) && $ban['id'] == $_SESSION['ban_ip']['id']) {
-                            $color = 'success';
-                            unset($_SESSION['ban_ip']['id']);
+                        } else {
+                            echo '<p>' . $hesklang['no_banips'] . '</p>';
                         }
 
-                        echo '
+                        // Get banned ips from database
+                        $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'banned_ips` ORDER BY `ip_from` ASC');
+                        $num = hesk_dbNumRows($res);
+
+                        echo '<br><h4>' . $hesklang['ipperm'] . '</h4>';
+
+                        if ($num < 1) {
+                            echo '<p>' . $hesklang['no_banips'] . '</p>';
+                        } else {
+                            // List of staff
+                            if (!isset($admins)) {
+                                $admins = array();
+                                $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
+                                while ($row = hesk_dbFetchAssoc($res2)) {
+                                    $admins[$row['id']] = $row['name'];
+                                }
+                            }
+
+                            ?>
+                            <table class="table table-hover">
+                                <thead>
+                                <tr>
+                                    <th><?php echo $hesklang['ip']; ?></th>
+                                    <th><?php echo $hesklang['iprange']; ?></th>
+                                    <th><?php echo $hesklang['banby']; ?></th>
+                                    <th><?php echo $hesklang['date']; ?></th>
+                                    <?php
+                                    if ($can_unban) {
+                                        ?>
+                                        <th><?php echo $hesklang['opt']; ?></th>
+                                        <?php
+                                    }
+                                    ?>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php
+                                while ($ban = hesk_dbFetchAssoc($res)) {
+                                    $color = '';
+                                    if (isset($_SESSION['ban_ip']['id']) && $ban['id'] == $_SESSION['ban_ip']['id']) {
+                                        $color = 'success';
+                                        unset($_SESSION['ban_ip']['id']);
+                                    }
+
+                                    echo '
                                 <tr>
                                     <td class="' . $color . '">' . $ban['ip_display'] . '</td>
                                     <td class="' . $color . '">' . (($ban['ip_to'] == $ban['ip_from']) ? long2ip($ban['ip_to']) : long2ip($ban['ip_from']) . ' - ' . long2ip($ban['ip_to'])) . '</td>
@@ -265,27 +269,32 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <td class="' . $color . '">' . $ban['dt'] . '</td>
                             ';
 
-                        if ($can_unban) {
-                            echo '
+                                    if ($can_unban) {
+                                        echo '
                                 <td class="' . $color . ' text-left">
                                     <a href="banned_ips.php?a=unban&amp;id=' . $ban['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();">
                                         <i class="fa fa-times red font-size-16p" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delban'] . '"></i></a>
                                 </td>
                             ';
+                                    }
+
+                                    echo '</tr>';
+                                } // End while
+                                ?>
+                                </tbody>
+                            </table>
+                            <?php
                         }
 
-                        echo '</tr>';
-                    } // End while
-                    ?>
-                    </tbody>
-                </table>
-                <?php
-            }
-
-            ?>
+                        ?>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
-</div>
+</section>
+
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/calendar.php b/admin/calendar.php
index 314ae6a4..a1182dcf 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CALENDAR');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -75,51 +76,85 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row pad-20">
-    <div class="col-lg-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4><?php echo $hesklang['calendar_categories']; ?></h4>
-            </div>
-            <div class="panel-body">
-                <div class="btn-group btn-group-sm">
-                    <button id="select-all" class="btn btn-default" data-select-all="category-toggle"><?php echo $hesklang['select_all_title_case']; ?></button>
-                    <button id="deselect-all" class="btn btn-default" data-deselect-all="category-toggle"><?php echo $hesklang['deselect_all_title_case']; ?></button>
+<section class="content">
+    <div class="row">
+        <div class="col-md-4">
+            <div class="box">
+                <div class="box-header">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['calendar_categories']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
                 </div>
-                <ul class="list-unstyled">
-                <?php foreach ($categories as $category): ?>
-                    <li class="move-down-20 move-right-20">
-                        <div class="checkbox">
-                            <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
+                <div class="box-body">
+                    <div class="btn-group btn-group-sm">
+                        <button id="select-all" class="btn btn-default" data-select-all="category-toggle"><?php echo $hesklang['select_all_title_case']; ?></button>
+                        <button id="deselect-all" class="btn btn-default" data-deselect-all="category-toggle"><?php echo $hesklang['deselect_all_title_case']; ?></button>
+                    </div>
+                    <ul class="list-unstyled">
+                        <?php foreach ($categories as $category): ?>
+                            <li class="move-down-20 move-right-20">
+                                <div class="checkbox">
+                                    <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
+                                </div>
+                                <div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>">
+                                    <?php echo $category['name']; ?>
+                                </div>
+                            </li>
+                        <?php endforeach; ?>
+                    </ul>
+                </div>
+            </div>
+            <div class="box">
+                <div class="box-header">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['legend']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <i class="fa fa-calendar"></i> <?php echo $hesklang['event']; ?>
                         </div>
-                        <div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>">
-                            <?php echo $category['name']; ?>
+                        <div class="col-sm-6">
+                            <i class="fa fa-ticket"></i> <?php echo $hesklang['ticket']; ?>
                         </div>
-                    </li>
-                <?php endforeach; ?>
-                </ul>
+                        <div class="col-sm-6">
+                            <i class="fa fa-exclamation-triangle"></i> <?php echo $hesklang['overdue_ticket_legend']; ?>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4><?php echo $hesklang['legend']; ?></h4>
-            </div>
-            <div class="panel-body">
-                <div class="row">
-                    <div class="col-sm-6">
-                        <i class="fa fa-calendar"></i> <?php echo $hesklang['event']; ?>
-                    </div>
-                    <div class="col-sm-6">
-                        <i class="fa fa-ticket"></i> <?php echo $hesklang['ticket']; ?>
-                    </div>
-                    <div class="col-sm-6">
-                        <i class="fa fa-exclamation-triangle"></i> <?php echo $hesklang['overdue_ticket_legend']; ?>
+        <div class="col-md-8">
+            <div class="box">
+                <div class="box-header">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['calendar_title_case']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
                     </div>
                 </div>
+                <div class="box-body no-padding">
+                    <div id="calendar"></div>
+                </div>
             </div>
         </div>
     </div>
+</section>
+<div class="row pad-20">
     <div class="col-lg-9">
         <div class="panel panel-default">
             <div class="panel-heading">
@@ -138,7 +173,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </h4>
             </div>
             <div class="panel-body">
-                <div id="calendar"></div>
+
             </div>
         </div>
     </div>
diff --git a/admin/edit_note.php b/admin/edit_note.php
index 170d27ae..1eed3993 100644
--- a/admin/edit_note.php
+++ b/admin/edit_note.php
@@ -35,6 +35,7 @@ define('HESK_PATH', '../');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -104,34 +105,44 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
     <li class="active"><?php echo $hesklang['ednote']; ?></li>
 </ol>
 
-<div class="row">
-    <div class="col-md-8 col-md-offset-2">
-        <h3><?php echo $hesklang['ednote']; ?></h3>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['ednote']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <form method="post" action="edit_note.php" name="form1" class="form-horizontal" role="form">
+                <div class="form-group">
+                    <label for="message" class="col-md-2 control-label"><?php echo $hesklang['message']; ?></label>
 
-        <div class="footerWithBorder blankSpace"></div>
-
-        <form method="post" action="edit_note.php" name="form1" class="form-horizontal" role="form">
-            <div class="form-group">
-                <label for="message" class="col-md-2 control-label"><?php echo $hesklang['message']; ?></label>
-
-                <div class="col-md-10">
+                    <div class="col-md-10">
                     <textarea name="message" class="form-control" rows="12"
                               cols="60"><?php echo $note['message']; ?></textarea>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-10 col-md-offset-2">
-                    <input type="hidden" name="save" value="1"/><input type="hidden" name="track"
-                                                                       value="<?php echo $trackingID; ?>"/>
-                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                    <input type="hidden" name="note" value="<?php echo $noteID; ?>"/>
-                    <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-primary">
-                    <a href="javascript:history.go(-1)" class="btn btn-default"><?php echo $hesklang['back']; ?></a>
+                <div class="form-group">
+                    <div class="col-md-10 col-md-offset-2">
+                        <input type="hidden" name="save" value="1">
+                        <input type="hidden" name="track" value="<?php echo $trackingID; ?>">
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
+                        <input type="hidden" name="note" value="<?php echo $noteID; ?>">
+                        <div class="btn-group">
+                            <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-primary">
+                            <a href="javascript:history.go(-1)" class="btn btn-default"><?php echo $hesklang['back']; ?></a>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </form>
+            </form>
+        </div>
     </div>
-</div>
+</section>
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/edit_post.php b/admin/edit_post.php
index c203b477..7e0f36a0 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -36,6 +36,7 @@ define('WYSIWYG', 1);
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -208,176 +209,183 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
     <li class="active"><?php echo $hesklang['edtt']; ?></li>
 </ol>
 
-<div class="row">
-    <div class="col-md-8 col-md-offset-2">
-        <h3><?php echo $hesklang['edtt']; ?></h3>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['edtt']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <form role="form" class="form-horizontal" method="post" action="edit_post.php" name="form1">
+                <?php
+                /* If it's not a reply edit all the fields */
+                if (!$is_reply) {
+                    if ($hesk_settings['can_sel_lang']) {
+                        ?>
+                        <div class="form-group">
+                            <label for="customerLanguage" class="col-sm-3 control-label"><?php echo $hesklang['chol']; ?>
+                                :</label>
 
-        <div class="footerWithBorder blankSpace"></div>
-
-        <form role="form" class="form-horizontal" method="post" action="edit_post.php" name="form1">
-            <?php
-            /* If it's not a reply edit all the fields */
-            if (!$is_reply) {
-                if ($hesk_settings['can_sel_lang']) {
-                    ?>
+                            <div class="col-sm-9">
+                                <select name="customerLanguage" id="customerLanguage" class="form-control">
+                                    <?php hesk_listLanguages(); ?>
+                                </select>
+                            </div>
+                        </div>
+                    <?php } else {
+                        echo '<input type="hidden" name="customerLanguage" value="' . $ticket['language'] . '">';
+                    } ?>
                     <div class="form-group">
-                        <label for="customerLanguage" class="col-sm-3 control-label"><?php echo $hesklang['chol']; ?>
-                            :</label>
+                        <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject']; ?>:</label>
 
                         <div class="col-sm-9">
-                            <select name="customerLanguage" id="customerLanguage" class="form-control">
-                                <?php hesk_listLanguages(); ?>
-                            </select>
+                            <input class="form-control" type="text" name="subject" size="40" maxlength="40"
+                                   value="<?php echo $ticket['subject']; ?>"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"/>
                         </div>
                     </div>
-                <?php } else {
-                    echo '<input type="hidden" name="customerLanguage" value="' . $ticket['language'] . '">';
-                } ?>
-                <div class="form-group">
-                    <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject']; ?>:</label>
+                    <div class="form-group">
+                        <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?>:</label>
 
-                    <div class="col-sm-9">
-                        <input class="form-control" type="text" name="subject" size="40" maxlength="40"
-                               value="<?php echo $ticket['subject']; ?>"
-                               placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"/>
+                        <div class="col-sm-9">
+                            <input class="form-control" type="text" name="name" size="40" maxlength="30"
+                                   value="<?php echo $ticket['name']; ?>"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>"/>
+                        </div>
                     </div>
-                </div>
-                <div class="form-group">
-                    <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?>:</label>
+                    <div class="form-group">
+                        <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?>:</label>
 
-                    <div class="col-sm-9">
-                        <input class="form-control" type="text" name="name" size="40" maxlength="30"
-                               value="<?php echo $ticket['name']; ?>"
-                               placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>"/>
+                        <div class="col-sm-9">
+                            <input class="form-control" type="text" name="email" size="40" maxlength="1000"
+                                   value="<?php echo $ticket['email']; ?>"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"/>
+                        </div>
                     </div>
-                </div>
-                <div class="form-group">
-                    <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?>:</label>
+                    <?php
+                    foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                        if ($v['use']) {
+                            if ($modsForHesk_settings['custom_field_setting']) {
+                                $v['name'] = $hesklang[$v['name']];
+                            }
 
-                    <div class="col-sm-9">
-                        <input class="form-control" type="text" name="email" size="40" maxlength="1000"
-                               value="<?php echo $ticket['email']; ?>"
-                               placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"/>
-                    </div>
-                </div>
-                <?php
-                foreach ($hesk_settings['custom_fields'] as $k => $v) {
-                    if ($v['use']) {
-                        if ($modsForHesk_settings['custom_field_setting']) {
-                            $v['name'] = $hesklang[$v['name']];
-                        }
+                            $k_value = $ticket[$k];
 
-                        $k_value = $ticket[$k];
+                            if ($v['type'] == 'checkbox') {
+                                $k_value = explode('<br />', $k_value);
+                            }
 
-                        if ($v['type'] == 'checkbox') {
-                            $k_value = explode('<br />', $k_value);
-                        }
-
-                        switch ($v['type']) {
-                            /* Radio box */
-                            case 'radio':
-                                echo '
+                            switch ($v['type']) {
+                                /* Radio box */
+                                case 'radio':
+                                    echo '
 						        <div class="form-group">
 						            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 		                        <div class="col-sm-9">';
 
-                                $options = explode('#HESK#', $v['value']);
+                                    $options = explode('#HESK#', $v['value']);
 
-                                foreach ($options as $option) {
+                                    foreach ($options as $option) {
 
-                                    if (strlen($k_value) == 0 || $k_value == $option) {
-                                        $k_value = $option;
-                                        $checked = 'checked="checked"';
-                                    } else {
-                                        $checked = '';
+                                        if (strlen($k_value) == 0 || $k_value == $option) {
+                                            $k_value = $option;
+                                            $checked = 'checked="checked"';
+                                        } else {
+                                            $checked = '';
+                                        }
+
+                                        echo '<div class="radio"><label><input type="radio" name="' . $k . '" value="' . $option . '" ' . $checked . ' /> ' . $option . '</label></div>';
                                     }
 
-                                    echo '<div class="radio"><label><input type="radio" name="' . $k . '" value="' . $option . '" ' . $checked . ' /> ' . $option . '</label></div>';
-                                }
-
-                                echo '</div>
+                                    echo '</div>
 						        </div>
 						        ';
-                                break;
+                                    break;
 
-                            /* Select drop-down box */
-                            case 'select':
-                                echo '
+                                /* Select drop-down box */
+                                case 'select':
+                                    echo '
 						        <div class="form-group">
 						        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 		                        <div class="col-sm-9"><select class="form-control" name="' . $k . '">';
 
-                                // Show "Click to select"?
-                                $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
-                                if ($num) {
-                                    echo '<option value="">' . $hesklang['select'] . '</option>';
-                                }
-
-                                $options = explode('#HESK#', $v['value']);
-
-                                foreach ($options as $option) {
-
-                                    if (strlen($k_value) == 0 || $k_value == $option) {
-                                        $k_value = $option;
-                                        $selected = 'selected="selected"';
-                                    } else {
-                                        $selected = '';
+                                    // Show "Click to select"?
+                                    $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
+                                    if ($num) {
+                                        echo '<option value="">' . $hesklang['select'] . '</option>';
                                     }
 
-                                    echo '<option ' . $selected . '>' . $option . '</option>';
-                                }
+                                    $options = explode('#HESK#', $v['value']);
 
-                                echo '</select></div>
+                                    foreach ($options as $option) {
+
+                                        if (strlen($k_value) == 0 || $k_value == $option) {
+                                            $k_value = $option;
+                                            $selected = 'selected="selected"';
+                                        } else {
+                                            $selected = '';
+                                        }
+
+                                        echo '<option ' . $selected . '>' . $option . '</option>';
+                                    }
+
+                                    echo '</select></div>
 						        </div>
 						        ';
-                                break;
+                                    break;
 
-                            /* Checkbox */
-                            case 'checkbox':
-                                echo '
+                                /* Checkbox */
+                                case 'checkbox':
+                                    echo '
 						        <div class="form-group">
 						            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 		                            <div class="col-sm-9">';
 
-                                $options = explode('#HESK#', $v['value']);
+                                    $options = explode('#HESK#', $v['value']);
 
-                                foreach ($options as $option) {
+                                    foreach ($options as $option) {
 
-                                    if (in_array($option, $k_value)) {
-                                        $checked = 'checked="checked"';
-                                    } else {
-                                        $checked = '';
+                                        if (in_array($option, $k_value)) {
+                                            $checked = 'checked="checked"';
+                                        } else {
+                                            $checked = '';
+                                        }
+
+                                        echo '<div class="checkbox"><label><input type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' /> ' . $option . '</label></div>';
                                     }
 
-                                    echo '<div class="checkbox"><label><input type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' /> ' . $option . '</label></div>';
-                                }
-
-                                echo '</div>
+                                    echo '</div>
 						        </div>
 						        ';
-                                break;
+                                    break;
 
-                            /* Large text box */
-                            case 'textarea':
-                                $size = explode('#', $v['value']);
-                                $size[0] = empty($size[0]) ? 5 : intval($size[0]);
-                                $size[1] = empty($size[1]) ? 30 : intval($size[1]);
-                                $k_value = hesk_msgToPlain($k_value, 0, 0);
+                                /* Large text box */
+                                case 'textarea':
+                                    $size = explode('#', $v['value']);
+                                    $size[0] = empty($size[0]) ? 5 : intval($size[0]);
+                                    $size[1] = empty($size[1]) ? 30 : intval($size[1]);
+                                    $k_value = hesk_msgToPlain($k_value, 0, 0);
 
-                                echo '
+                                    echo '
 						        <div class="form-group">
 						            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 						            <div class="col-sm-9">
                                         <textarea class="form-control" name="' . $k . '" rows="' . $size[0] . '" placeholder="' . htmlspecialchars($v['name']) . '" cols="' . $size[1] . '">' . $k_value . '</textarea>
 						            </div>
 		                        </div>';
-                                break;
+                                    break;
 
-                            case 'date':
-                                if (strlen($k_value) != 0) {
-                                    $v['value'] = $k_value;
-                                }
-                                echo '
+                                case 'date':
+                                    if (strlen($k_value) != 0) {
+                                        $v['value'] = $k_value;
+                                    }
+                                    echo '
                                 <div class="form-group">
                                     <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
                                     <div class="col-sm-9">
@@ -385,63 +393,63 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             maxlength="' . $v['maxlen'] . '" value="' . date('Y-m-d', $v['value']) . '" readonly/>
                                     </div>
                                 </div>';
-                                break;
-                            case 'multiselect':
-                                echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
+                                    break;
+                                case 'multiselect':
+                                    echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
                                 <div class="col-sm-9"><select class="form-control" id="' . $v['name'] . '" name="' . $k . '" multiple>';
-                                $options = explode('#HESK#', $v['value']);
-                                foreach ($options as $option) {
-                                    if (strlen($k_value) == 0 || $k_value == $option) {
-                                        $k_value = $option;
-                                        $selected = 'selected="selected"';
-                                    } else {
-                                        $selected = '';
+                                    $options = explode('#HESK#', $v['value']);
+                                    foreach ($options as $option) {
+                                        if (strlen($k_value) == 0 || $k_value == $option) {
+                                            $k_value = $option;
+                                            $selected = 'selected="selected"';
+                                        } else {
+                                            $selected = '';
+                                        }
+                                        echo '<option ' . $selected . '>' . $option . '</option>';
                                     }
-                                    echo '<option ' . $selected . '>' . $option . '</option>';
-                                }
-                                echo '</select>
+                                    echo '</select>
                                 <div class="btn-group" role="group">
                                     <button type="button" class="btn btn-default" onclick="selectAll(\'' . $v['name'] . '\')">'.$hesklang['select_all_title_case'].'</button>
                                     <button type="button" class="btn btn-default" onclick="deselectAll(\'' . $v['name'] . '\')">'.$hesklang['deselect_all_title_case'].'</button>
                                 </div></div></div>';
-                                break;
+                                    break;
 
-                            case 'hidden':
-                                //Clean up multiple dashes or whitespaces
-                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+                                case 'hidden':
+                                    //Clean up multiple dashes or whitespaces
+                                    $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                    $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
 
-                                if (strlen($k_value) != 0) {
-                                    $v['value'] = $k_value;
-                                }
+                                    if (strlen($k_value) != 0) {
+                                        $v['value'] = $k_value;
+                                    }
 
-                                echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '"/>';
+                                    echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '"/>';
 
-                                break;
+                                    break;
 
-                            case 'readonly':
-                                //Clean up multiple dashes or whitespaces
-                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+                                case 'readonly':
+                                    //Clean up multiple dashes or whitespaces
+                                    $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                    $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
 
-                                if (strlen($k_value) != 0) {
-                                    $v['value'] = $k_value;
-                                }
+                                    if (strlen($k_value) != 0) {
+                                        $v['value'] = $k_value;
+                                    }
 
-                                echo '<div class="form-group">
+                                    echo '<div class="form-group">
                                 <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 					            <div class="col-sm-9"><input type="text" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" readonly></div>
                                 </div>';
 
-                                break;
+                                    break;
 
-                            /* Default text input */
-                            default:
-                                if (strlen($k_value) != 0) {
-                                    $k_value = hesk_msgToPlain($k_value, 0, 0);
-                                    $v['value'] = $k_value;
-                                }
-                                echo '
+                                /* Default text input */
+                                default:
+                                    if (strlen($k_value) != 0) {
+                                        $k_value = hesk_msgToPlain($k_value, 0, 0);
+                                        $v['value'] = $k_value;
+                                    }
+                                    echo '
 						        <div class="form-group">
 						            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . ': </label>
 						            <div class="col-sm-9">
@@ -449,12 +457,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     </div>
 						        </div>
 						        ';
+                            }
                         }
                     }
-                }
-            } ?>
-            <div class="form-group">
-                <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>:</label>
+                    ?>
+
+                <?php } ?>
+                <div class="form-group">
+                    <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>:</label>
 
                 <div class="col-sm-9">
                     <?php
diff --git a/admin/export.php b/admin/export.php
index 1ac0440b..304e9594 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/reporting_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -649,272 +650,262 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row move-down-20">
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading"><?php echo $hesklang['export']; ?></div>
+<section class="content">
+    <div class="box">
+        <div class="box-header">
+            <h1 class="box-title">
+                <?php echo $hesklang['export']; ?>
+            </h1>
             <?php
             if (hesk_checkPermission('can_run_reports', 0)) {
-                $canRunReports = true;
-            } else {
-                $canRunReports = false;
+                echo '<br><small><a href="reports.php">' . $hesklang['reports_tab'] . '</a></small>';
             }
             ?>
-            <div class="panel-body" <?php if ($canRunReports) {
-                echo 'style="margin-top: -15px;"';
-            } ?>>
-                <?php if ($canRunReports) {
-                    echo '<small><a href="reports.php">' . $hesklang['reports_tab'] . '</a></small><div class="blankSpace"></div>';
-                } ?>
-                <p><?php echo $hesklang['export_intro']; ?></p>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
         </div>
-    </div>
-    <div class="col-md-8">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
+        <div class="box-body">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
 
-        // If an export was generated, show the link to download
-        if (isset($flush_me)) {
-            if ($tickets_exported > 0) {
-                hesk_show_success($flush_me);
-            } else {
-                hesk_show_notice($hesklang['n2ex']);
+            // If an export was generated, show the link to download
+            if (isset($flush_me)) {
+                if ($tickets_exported > 0) {
+                    hesk_show_success($flush_me);
+                } else {
+                    hesk_show_notice($hesklang['n2ex']);
+                }
             }
-        }
-        ?>
+            ?>
+            <form name="showt" action="export.php" method="get" role="form">
+                <div class="form-group">
+                    <label for="time" class="control-label col-sm-2"><?php echo $hesklang['dtrg']; ?>:</label>
 
-        <h3><?php echo $hesklang['export']; ?></h3>
+                    <div class="col-sm-10">
+                        <!-- START DATE -->
+                        <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
+                        <select name="time" onclick="document.getElementById('w0').checked = true"
+                                onfocus="document.getElementById('w0').checked = true"
+                                style="margin-top:5px;margin-bottom:5px;">
+                            <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
+                                (<?php echo $hesklang['d' . date('w')]; ?>)
+                            </option>
+                            <option value="2" <?php echo $selected['time'][2]; ?>><?php echo $hesklang['r2']; ?>
+                                (<?php echo $hesklang['d' . date('w', mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')))]; ?>
+                                )
+                            </option>
+                            <option value="3" <?php echo $selected['time'][3]; ?>><?php echo $hesklang['r3']; ?>
+                                (<?php echo $hesklang['m' . date('n')]; ?>)
+                            </option>
+                            <option value="4" <?php echo $selected['time'][4]; ?>><?php echo $hesklang['r4']; ?>
+                                (<?php echo $hesklang['m' . date('n', mktime(0, 0, 0, date('m') - 1, date('d'), date('Y')))]; ?>
+                                )
+                            </option>
+                            <option value="5" <?php echo $selected['time'][5]; ?>><?php echo $hesklang['r5']; ?></option>
+                            <option value="6" <?php echo $selected['time'][6]; ?>><?php echo $hesklang['r6']; ?></option>
+                            <option value="7" <?php echo $selected['time'][7]; ?>><?php echo $hesklang['r7']; ?></option>
+                            <option value="8" <?php echo $selected['time'][8]; ?>><?php echo $hesklang['r8']; ?></option>
+                            <option value="9" <?php echo $selected['time'][9]; ?>><?php echo $hesklang['r9']; ?></option>
+                            <option value="10" <?php echo $selected['time'][10]; ?>><?php echo $hesklang['r10']; ?>
+                                (<?php echo date('Y'); ?>)
+                            </option>
+                            <option value="11" <?php echo $selected['time'][11]; ?>><?php echo $hesklang['r11']; ?>
+                                (<?php echo date('Y', mktime(0, 0, 0, date('m'), date('d'), date('Y') - 1)); ?>)
+                            </option>
+                            <option value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
+                        </select>
 
-        <div class="footerWithBorder blankSpace"></div>
+                        <br/>
 
-        <form name="showt" action="export.php" method="get" class="form-horizontal" role="form">
-            <div class="form-group">
-                <label for="time" class="control-label col-sm-2"><?php echo $hesklang['dtrg']; ?>:</label>
-
-                <div class="col-sm-10">
-                    <!-- START DATE -->
-                    <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
-                    <select name="time" onclick="document.getElementById('w0').checked = true"
-                            onfocus="document.getElementById('w0').checked = true"
-                            style="margin-top:5px;margin-bottom:5px;">
-                        <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
-                            (<?php echo $hesklang['d' . date('w')]; ?>)
-                        </option>
-                        <option value="2" <?php echo $selected['time'][2]; ?>><?php echo $hesklang['r2']; ?>
-                            (<?php echo $hesklang['d' . date('w', mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')))]; ?>
-                            )
-                        </option>
-                        <option value="3" <?php echo $selected['time'][3]; ?>><?php echo $hesklang['r3']; ?>
-                            (<?php echo $hesklang['m' . date('n')]; ?>)
-                        </option>
-                        <option value="4" <?php echo $selected['time'][4]; ?>><?php echo $hesklang['r4']; ?>
-                            (<?php echo $hesklang['m' . date('n', mktime(0, 0, 0, date('m') - 1, date('d'), date('Y')))]; ?>
-                            )
-                        </option>
-                        <option value="5" <?php echo $selected['time'][5]; ?>><?php echo $hesklang['r5']; ?></option>
-                        <option value="6" <?php echo $selected['time'][6]; ?>><?php echo $hesklang['r6']; ?></option>
-                        <option value="7" <?php echo $selected['time'][7]; ?>><?php echo $hesklang['r7']; ?></option>
-                        <option value="8" <?php echo $selected['time'][8]; ?>><?php echo $hesklang['r8']; ?></option>
-                        <option value="9" <?php echo $selected['time'][9]; ?>><?php echo $hesklang['r9']; ?></option>
-                        <option value="10" <?php echo $selected['time'][10]; ?>><?php echo $hesklang['r10']; ?>
-                            (<?php echo date('Y'); ?>)
-                        </option>
-                        <option value="11" <?php echo $selected['time'][11]; ?>><?php echo $hesklang['r11']; ?>
-                            (<?php echo date('Y', mktime(0, 0, 0, date('m'), date('d'), date('Y') - 1)); ?>)
-                        </option>
-                        <option value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
-                    </select>
-
-                    <br/>
-
-                    <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
-                    <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
-                                                            value="<?php echo $input_datefrom; ?>" id="datefrom"
-                                                            class="tcal" size="10"
-                                                            onclick="document.getElementById('w1').checked = true"
-                                                            onfocus="document.getElementById('w1').checked = true;this.focus;"/>
-                    <?php echo $hesklang['to']; ?> <input type="text" name="dateto" value="<?php echo $input_dateto; ?>"
-                                                          id="dateto" class="tcal" size="10"
-                                                          onclick="document.getElementById('w1').checked = true"
-                                                          onfocus="document.getElementById('w1').checked = true; this.focus;"/>
-                    <!-- END DATE -->
+                        <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
+                        <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
+                                                                value="<?php echo $input_datefrom; ?>" id="datefrom"
+                                                                class="tcal" size="10"
+                                                                onclick="document.getElementById('w1').checked = true"
+                                                                onfocus="document.getElementById('w1').checked = true;this.focus;"/>
+                        <?php echo $hesklang['to']; ?> <input type="text" name="dateto" value="<?php echo $input_dateto; ?>"
+                                                              id="dateto" class="tcal" size="10"
+                                                              onclick="document.getElementById('w1').checked = true"
+                                                              onfocus="document.getElementById('w1').checked = true; this.focus;"/>
+                        <!-- END DATE -->
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="status" class="control-label col-sm-2"><?php echo $hesklang['status']; ?>:</label>
+                <div class="form-group">
+                    <label for="status" class="control-label col-sm-2"><?php echo $hesklang['status']; ?>:</label>
 
-                <div class="col-sm-10">
-                    <?php
-                    $statuses = mfh_getAllStatuses();
-                    foreach ($statuses as $row) {
+                    <div class="col-sm-10">
+                        <?php
+                        $statuses = mfh_getAllStatuses();
+                        foreach ($statuses as $row) {
+                            ?>
+                            <div class="col-xs-4">
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="s<?php echo $row['ID']; ?>"
+                                                  value="1" <?php if (isset($status[$row['ID']])) {
+                                            echo 'checked="checked"';
+                                        } ?> /> <span
+                                            style="color: <?php echo $row['TextColor']; ?>"><?php echo $row['text']; ?></span></label>
+                                </div>
+                            </div>
+                            <?php
+                        }
                         ?>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="priority" class="col-sm-2 control-label"><?php echo $hesklang['priority']; ?>:</label>
+
+                    <div class="col-sm-10">
                         <div class="col-xs-4">
                             <div class="checkbox">
-                                <label><input type="checkbox" name="s<?php echo $row['ID']; ?>"
-                                              value="1" <?php if (isset($status[$row['ID']])) {
+                                <label><input type="checkbox" name="p0" value="1" <?php if (isset($priority[0])) {
                                         echo 'checked="checked"';
-                                    } ?> /> <span
-                                        style="color: <?php echo $row['TextColor']; ?>"><?php echo $row['text']; ?></span></label>
+                                    } ?> /> <span class="critical"><?php echo $hesklang['critical']; ?></span></label>
+                            </div>
+                            <div class="checkbox">
+                                <label><input type="checkbox" name="p1" value="1" <?php if (isset($priority[1])) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <span class="important"><?php echo $hesklang['high']; ?></span></label>
                             </div>
                         </div>
-                        <?php
-                    }
-                    ?>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="priority" class="col-sm-2 control-label"><?php echo $hesklang['priority']; ?>:</label>
-
-                <div class="col-sm-10">
-                    <div class="col-xs-4">
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="p0" value="1" <?php if (isset($priority[0])) {
-                                    echo 'checked="checked"';
-                                } ?> /> <span class="critical"><?php echo $hesklang['critical']; ?></span></label>
-                        </div>
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="p1" value="1" <?php if (isset($priority[1])) {
-                                    echo 'checked="checked"';
-                                } ?> /> <span class="important"><?php echo $hesklang['high']; ?></span></label>
-                        </div>
-                    </div>
-                    <div class="col-xs-4">
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="p2" value="1" <?php if (isset($priority[2])) {
-                                    echo 'checked="checked"';
-                                } ?> /> <span class="medium"><?php echo $hesklang['medium']; ?></span></label>
-                        </div>
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="p3" value="1" <?php if (isset($priority[3])) {
-                                    echo 'checked="checked"';
-                                } ?> /> <span class="normal"><?php echo $hesklang['low']; ?></span></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="assign" class="col-sm-2 control-label"><?php echo $hesklang['show']; ?>:</label>
-
-                <div class="col-sm-10">
-                    <div class="col-xs-4">
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="s_my"
-                                          value="1" <?php if ($s_my[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_my']; ?>
-                            </label>
-                        </div>
-                        <?php
-                        if ($can_view_unassigned) {
-                            ?>
+                        <div class="col-xs-4">
                             <div class="checkbox">
-                                <label><input type="checkbox" name="s_un"
-                                              value="1" <?php if ($s_un[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_un']; ?>
+                                <label><input type="checkbox" name="p2" value="1" <?php if (isset($priority[2])) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <span class="medium"><?php echo $hesklang['medium']; ?></span></label>
+                            </div>
+                            <div class="checkbox">
+                                <label><input type="checkbox" name="p3" value="1" <?php if (isset($priority[3])) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <span class="normal"><?php echo $hesklang['low']; ?></span></label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="assign" class="col-sm-2 control-label"><?php echo $hesklang['show']; ?>:</label>
+
+                    <div class="col-sm-10">
+                        <div class="col-xs-4">
+                            <div class="checkbox">
+                                <label><input type="checkbox" name="s_my"
+                                              value="1" <?php if ($s_my[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_my']; ?>
                                 </label>
                             </div>
                             <?php
-                        }
-                        ?>
-                    </div>
-                    <div class="col-xs-4">
-                        <?php
-                        if ($can_view_ass_others) {
+                            if ($can_view_unassigned) {
+                                ?>
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="s_un"
+                                                  value="1" <?php if ($s_un[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_un']; ?>
+                                    </label>
+                                </div>
+                                <?php
+                            }
+                            ?>
+                        </div>
+                        <div class="col-xs-4">
+                            <?php
+                            if ($can_view_ass_others) {
+                                ?>
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="s_ot"
+                                                  value="1" <?php if ($s_ot[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_ot']; ?>
+                                    </label>
+                                </div>
+                                <?php
+                            }
                             ?>
                             <div class="checkbox">
-                                <label><input type="checkbox" name="s_ot"
-                                              value="1" <?php if ($s_ot[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_ot']; ?>
+                                <label><input type="checkbox" name="archive"
+                                              value="1" <?php if ($archive[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['disp_only_archived']; ?>
                                 </label>
                             </div>
-                            <?php
-                        }
-                        ?>
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="archive"
-                                          value="1" <?php if ($archive[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['disp_only_archived']; ?>
-                            </label>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="sort" class="col-sm-2 control-label"><?php echo $hesklang['sort_by']; ?>:</label>
+                <div class="form-group">
+                    <label for="sort" class="col-sm-2 control-label"><?php echo $hesklang['sort_by']; ?>:</label>
 
-                <div class="col-sm-10">
-                    <div class="col-xs-4">
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="priority" <?php if ($sort == 'priority') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['priority']; ?></label>
+                    <div class="col-sm-10">
+                        <div class="col-xs-4">
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="priority" <?php if ($sort == 'priority') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['priority']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="lastchange" <?php if ($sort == 'lastchange') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['last_update']; ?></label>
+                            </div>
                         </div>
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="lastchange" <?php if ($sort == 'lastchange') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['last_update']; ?></label>
+                        <div class="col-xs-4">
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="name" <?php if ($sort == 'name') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['name']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="subject" <?php if ($sort == 'subject') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['subject']; ?></label>
+                            </div>
                         </div>
-                    </div>
-                    <div class="col-xs-4">
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="name" <?php if ($sort == 'name') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['name']; ?></label>
-                        </div>
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="subject" <?php if ($sort == 'subject') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['subject']; ?></label>
-                        </div>
-                    </div>
-                    <div class="col-xs-4">
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="status" <?php if ($sort == 'status') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['status']; ?></label>
-                        </div>
-                        <div class="radio">
-                            <label><input type="radio" name="sort" value="id" <?php if ($sort == 'id') {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['sequentially']; ?></label>
+                        <div class="col-xs-4">
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="status" <?php if ($sort == 'status') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['status']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="sort" value="id" <?php if ($sort == 'id') {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['sequentially']; ?></label>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="asc" class="col-sm-2 control-label"><?php echo $hesklang['category']; ?>:</label>
+                <div class="form-group">
+                    <label for="asc" class="col-sm-2 control-label"><?php echo $hesklang['category']; ?>:</label>
 
-                <div class="col-sm-10">
-                    <select name="category" class="form-control">
-                        <option value="0"><?php echo $hesklang['any_cat']; ?></option>
-                        <?php echo $category_options; ?>
-                    </select>
+                    <div class="col-sm-10">
+                        <select name="category" class="form-control">
+                            <option value="0"><?php echo $hesklang['any_cat']; ?></option>
+                            <?php echo $category_options; ?>
+                        </select>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="asc" class="col-sm-2 control-label"><?php echo $hesklang['order']; ?>:</label>
+                <div class="form-group">
+                    <label for="asc" class="col-sm-2 control-label"><?php echo $hesklang['order']; ?>:</label>
 
-                <div class="col-sm-10">
-                    <div class="col-xs-4">
-                        <div class="radio">
-                            <label><input type="radio" name="asc" value="1" <?php if ($asc) {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['ascending']; ?></label>
-                        </div>
-                        <div class="radio">
-                            <label><input type="radio" name="asc" value="0" <?php if (!$asc) {
-                                    echo 'checked="checked"';
-                                } ?> /> <?php echo $hesklang['descending']; ?></label>
+                    <div class="col-sm-10">
+                        <div class="col-xs-4">
+                            <div class="radio">
+                                <label><input type="radio" name="asc" value="1" <?php if ($asc) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['ascending']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="asc" value="0" <?php if (!$asc) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['descending']; ?></label>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="form-group text-center">
-                <input type="submit" value="<?php echo $hesklang['export_btn']; ?>" class="btn btn-default"/>
-                <input type="hidden" name="cot" value="1"/>
-            </div>
-        </form>
+                <div class="form-group">
+                    <input type="submit" value="<?php echo $hesklang['export_btn']; ?>" class="btn btn-default"/>
+                    <input type="hidden" name="cot" value="1"/>
+                </div>
+            </form>
+        </div>
     </div>
-</div>
-
+</section>
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
diff --git a/admin/index.php b/admin/index.php
index 5e7598f1..8709a501 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,6 +30,7 @@
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
+define('PAGE_TITLE', 'LOGIN');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -58,9 +59,6 @@ switch ($action) {
         hesk_autoLogin();
         print_login();
 }
-
-/* Print footer */
-require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
 
 /*** START FUNCTIONS ***/
@@ -274,7 +272,7 @@ function print_login()
     }
 
     $hesk_settings['tmp_title'] = $hesk_settings['hesk_title'] . ' - ' .$hesklang['admin_login'];
-	require_once(HESK_PATH . 'inc/header.inc.php');
+	require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
 	if ( hesk_isREQUEST('notice') )
 	{
@@ -287,29 +285,37 @@ function print_login()
     }
 
 	?>
-    <div class="loginError"><?php
-	            /* This will handle error, success and notice messages */
-	            hesk_handle_messages();
-	        ?></div>
-    <div>
-    <div class="panel panel-default form-signin">
-        <div class="panel-heading">
-            <h4><span <?php echo $iconDisplay; ?>><span class="mega-octicon octicon-sign-in"></span>&nbsp;</span><?php echo $hesklang['admin_login']; ?></h4>
+<div class="login-box">
+    <div class="login-logo">
+        <?php echo $hesk_settings['hesk_title']; ?>
+    </div>
+    <div class="login-box-body">
+        <div class="loginError">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
+            ?>
         </div>
-        <div class="panel-body">
-            <form class="form-signin form-horizontal" role="form" action="index.php" method="post" name="form1">
-                <?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?>
-                <label for="user" class="col-sm-4 control-label"><?php echo $hesklang['username']; ?>:</label>
+        <h4 class="login-box-msg">
+            <?php echo $hesklang['staff_login_title']; ?>
+        </h4>
+        <form class="form-horizontal" role="form" action="index.php" method="post" name="form1">
+            <?php
+            $has_error = '';
+            if (in_array('pass',$_SESSION['a_iserror'])) {
+                $has_error = 'has-error';
+            }
+            ?>
+            <div class="form-group <?php echo $has_error; ?>">
+                <label for="user" class="col-sm-4 control-label">
+                    <?php echo $hesklang['username']; ?>
+                </label>
                 <div class="col-sm-8">
                     <?php
-
-                    if (defined('HESK_USER'))
-                    {
+                    if (defined('HESK_USER')) {
                         $savedUser = HESK_USER;
-                    }
-                    else
-                    {
-                        $savedUser = hesk_htmlspecialchars( hesk_COOKIE('hesk_username') );
+                    } else {
+                        $savedUser = hesk_htmlspecialchars(hesk_COOKIE('hesk_username'));
                     }
 
                     $is_1 = '';
@@ -318,44 +324,48 @@ function print_login()
 
                     $remember_user = hesk_POST('remember_user');
 
-                    if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN') )
-                    {
-                        $is_1 = 'checked="checked"';
-                    }
-                    elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER' )
-                    {
-                        $is_2 = 'checked="checked"';
-                    }
-                    else
-                    {
-                        $is_3 = 'checked="checked"';
+                    if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN')) {
+                        $is_1 = 'checked';
+                    } elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER') {
+                        $is_2 = 'checked';
+                    } else {
+                        $is_3 = 'checked';
                     }
 
-                    if ($hesk_settings['list_users'])
-                    {
-                        echo '<select class="form-control" name="user">';
-                        $res = hesk_dbQuery('SELECT `user` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'users` ORDER BY `user` ASC');
-                        while ($row=hesk_dbFetchAssoc($res))
-                        {
-                            $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected="selected"' : '';
-                            echo '<option value="'.$row['user'].'" '.$sel.'>'.$row['user'].'</option>';
-                        }
-                        echo '</select>';
-
-                    }
-                    else
-                    {
-                        echo '<input class="form-control" type="text" name="user" size="35" placeholder="'.htmlspecialchars($hesklang['username']).'" value="'.$savedUser.'" />';
-                    }
+                    if ($hesk_settings['list_users']) :
+                        $res = hesk_dbQuery("SELECT `user` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `user` ASC");
                     ?>
+                        <select class="form-control" name="user">
+                            <?php
+                            while ($row = hesk_dbFetchAssoc($res)):
+                                $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected' : '';
+                            ?>
+                                <option value="<?php echo $row['user']; ?>" <?php echo $sel; ?>>
+                                    <?php echo $row['user']; ?>
+                                </option>
+                            <?php endwhile; ?>
+                        </select>
+                    <?php else: ?>
+                        <input class="form-control" type="text" name="user" size="35"
+                               placeholder="<?php echo htmlspecialchars($hesklang['username']); ?>"
+                               value="<?php echo $savedUser; ?>">
+                    <?php endif; ?>
                 </div>
             </div>
-            <?php if (in_array('pass',$_SESSION['a_iserror'])) { echo '<div class="form-group has-error">';} else { echo '<div class="form-group">';}?>
-            <label for="pass" class="col-sm-4 control-label"><?php echo $hesklang['pass']; ?>:</label>
-            <div class="col-sm-8">
-                <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>"  />
+            <?php
+            $has_error = '';
+            if (in_array('pass',$_SESSION['a_iserror'])) {
+                $has_error = 'has-error';
+            }
+            ?>
+            <div class="form-group <?php echo $has_error; ?>">
+                <label for="pass" class="col-sm-4 control-label">
+                    <?php echo $hesklang['pass']; ?>
+                </label>
+                <div class="col-sm-8">
+                    <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>">
+                </div>
             </div>
-        </div>
             <?php
             if ($hesk_settings['secimg_use'] == 2)
             {
@@ -387,22 +397,22 @@ function print_login()
                             }
                         };
                     </script>
-                    <?php
-                    require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
-                    echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
-                    echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
-                    echo '</div></div>';
+                <?php
+                require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
+                echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
+                echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
+                echo '</div></div>';
                 }
                 // Use reCaptcha API v2?
                 elseif ($hesk_settings['recaptcha_use'] == 2)
                 {
-                    ?>
+                ?>
                     <div class="form-group">
                         <div class="col-md-8 col-md-offset-4">
                             <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>"></div>
                         </div>
                     </div>
-                <?php
+                    <?php
                 }
                 // At least use some basic PHP generated image (better than nothing)
                 else
@@ -410,9 +420,9 @@ function print_login()
                     echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
                     $cls = in_array('mysecnum',$_SESSION['a_iserror']) ? ' class="isError" ' : '';
 
-                    echo $hesklang['sec_enter'].'<br />&nbsp;<br /><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom" /> '.
-                        '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom" /></a>'.
-                        '<br />&nbsp;<br /><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.' />';
+                    echo $hesklang['sec_enter'].'<br><br><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom"> '.
+                        '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom"></a>'.
+                        '<br><br><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.'>';
                     echo '</div></div>';
                 }
             } // End if $hesk_settings['secimg_use'] == 2
@@ -423,17 +433,17 @@ function print_login()
                 <div class="form-group">
                     <div class="col-md-offset-4 col-md-8">
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?> /> <?php echo $hesklang['autologin']; ?></label>
+                            <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?>> <?php echo $hesklang['autologin']; ?></label>
                         </div>
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?> /> <?php echo $hesklang['just_user']; ?></label>
+                            <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?>> <?php echo $hesklang['just_user']; ?></label>
                         </div>
                         <div class="radio">
-                            <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?> /> <?php echo $hesklang['nothx']; ?></label>
+                            <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?>> <?php echo $hesklang['nothx']; ?></label>
                         </div>
                     </div>
                 </div>
-            <?php
+                <?php
             }
             else
             {
@@ -445,40 +455,33 @@ function print_login()
                         </div>
                     </div>
                 </div>
-            <?php
+                <?php
             } // End if $hesk_settings['autologin']
             ?>
             <div class="form-group">
                 <div class="col-md-offset-4 col-md-8">
-                    <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default" />
-                    <input type="hidden" name="a" value="do_login" />
+                    <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default">
+                    <input type="hidden" name="a" value="do_login">
                     <?php
                     if ( hesk_isREQUEST('goto') && $url=hesk_REQUEST('goto') )
                     {
-                        echo '<input type="hidden" name="goto" value="'.$url.'" />';
+                        echo '<input type="hidden" name="goto" value="'.$url.'">';
                     }
 
                     // Do we allow staff password reset?
                     if ($hesk_settings['reset_pass'])
                     {
-                        echo '<br />&nbsp;<br /><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
+                        echo '<br><br><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
                     }
                     ?>
                 </div>
             </div>
-
-            </form>
-        </div>
+        </form>
     </div>
-
-    </div>
-
-    <p>&nbsp;</p>
-
-	<?php
+</div>
+<?php
 	hesk_cleanSessionVars('a_iserror');
 
-    require_once(HESK_PATH . 'inc/footer.inc.php');
     exit();
 } // End print_login()
 
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 5aa3769a..c675f387 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -56,6 +57,7 @@ $can_man_kb = hesk_checkPermission('can_man_kb',0);
 $catid = intval( hesk_GET('category', 1) );
 $artid = intval( hesk_GET('article', 0) );
 
+
 if (isset($_GET['search']))
 {
 	$query = hesk_input( hesk_GET('search') );
@@ -69,7 +71,9 @@ $hesk_settings['kb_link'] = ($artid || $catid != 1 || $query) ? '<a href="knowle
 
 if ($hesk_settings['kb_search'] && $query)
 {
-    hesk_kb_search($query);
+    if (hesk_kb_search($query)) {
+		hesk_show_kb_category(1,1);
+	}
 }
 elseif ($artid)
 {
@@ -98,7 +102,7 @@ else
 {
 	hesk_show_kb_category($catid);
 }
-?> </div> <?php
+
 require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
 
@@ -114,11 +118,6 @@ function hesk_kb_header($kb_link, $catid=1)
 	require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	?>
 
-	</td>
-	</tr>
-	<tr>
-	<td>
-
 	<ol class="breadcrumb">
     <?php
     if ($can_man_kb)
@@ -130,15 +129,10 @@ function hesk_kb_header($kb_link, $catid=1)
     ?>
 	<li class="active"><?php echo $kb_link; ?></li>
     </ol>
-
-	<!-- SUB NAVIGATION -->
 	<?php show_subnav('view', $catid); ?>
-	<!-- SUB NAVIGATION -->
-
-    <div style="margin-left:40px;margin-right:40px">
-
-	<?php hesk_kbSearchLarge(1); ?>
-
+	<section style="padding: 15px;">
+		<?php hesk_kbSearchLarge(1); ?>
+	</section>
 
     <?php
 } // END hesk_kb_header()
@@ -154,41 +148,43 @@ function hesk_kb_search($query)
 
     $res = hesk_dbQuery('SELECT t1.`id`, t1.`subject`, LEFT(`t1`.`content`, '.max(200, $hesk_settings['kb_substrart'] * 2).') AS `content`, t1.`rating` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_articles` AS t1 LEFT JOIN `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_categories` AS t2 ON t1.`catid` = t2.`id` '." WHERE t1.`type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('".hesk_dbEscape($query)."') LIMIT ".intval($hesk_settings['kb_search_limit']));
     $num = hesk_dbNumRows($res);
-
+	$show_default_category = false;
     ?>
-	<h4><?php echo $hesklang['sr']; ?> (<?php echo $num; ?>)</h4>
-    <div class="footerWithBorder blankSpace"></div>
+	<section style="padding: 15px">
+		<div class="box">
+			<div class="box-header with-border">
+				<h1 class="box-title">
+					<?php echo $hesklang['sr']; ?> (<?php echo $num; ?>)
+				</h1>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" data-widget="collapse">
+						<i class="fa fa-minus"></i>
+					</button>
+				</div>
+			</div>
+			<div class="box-body">
+				<?php
+				if ($num == 0) {
+					echo '<i>'.$hesklang['nosr'].'</i>';
+					$show_default_category = true;
+				} else {
+					?>
+					<table class="table table-striped">
+						<?php
+						while ($article = hesk_dbFetchAssoc($res))
+						{
+							$txt = hesk_kbArticleContentPreview($article['content']);
 
-	<?php
-	if ($num == 0)
-	{
-		echo '<p style="margin-left:20px"><i>'.$hesklang['nosr'].'</i></p>';
-        hesk_show_kb_category(1,1);
-	}
-    else
-    {
-?>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-	<td>
-		<div align="center">
-        <table border="0" cellspacing="1" cellpadding="3" width="100%">
-        <?php
-			while ($article = hesk_dbFetchAssoc($res))
-			{
-	            $txt = hesk_kbArticleContentPreview($article['content']);
+							if ($hesk_settings['kb_rating'])
+							{
+								$rat = '<td width="1" valign="top">' . mfh_get_stars($article['rating']) . '</td>';
+							}
+							else
+							{
+								$rat = '';
+							}
 
-	            if ($hesk_settings['kb_rating'])
-	            {
-	            	$alt = $article['rating'] ? sprintf($hesklang['kb_rated'], sprintf("%01.1f", $article['rating'])) : $hesklang['kb_not_rated'];
-	                $rat = '<td width="1" valign="top"><img src="../img/star_'.(hesk_round_to_half($article['rating'])*10).'.png" width="85" height="16" alt="'.$alt.'" border="0" style="vertical-align:text-bottom" /></td>';
-	            }
-	            else
-	            {
-	            	$rat = '';
-	            }
-
-				echo '
+							echo '
 				<tr>
 				<td>
 	                <table border="0" width="100%" cellspacing="0" cellpadding="1">
@@ -207,18 +203,16 @@ function hesk_kb_search($query)
 
 	            </td>
 				</tr>';
-			}
-	?>
-    	</table>
-        </div>
-	</td>
-</tr>
-</table>
-
-    <p><br /><a href="javascript:history.go(-1)"><span class="glyphicon glyphicon-circle-arrow-left"></span>&nbsp;<?php echo $hesklang['back']; ?></a></p>
+						}
+						?>
+					</table>
+					<a href="javascript:history.go(-1)"><span class="glyphicon glyphicon-circle-arrow-left"></span>&nbsp;<?php echo $hesklang['back']; ?></a>
+				<?php } ?>
+			</div>
+		</div>
+	</section>
     <?php
-    } // END else
-
+	return $show_default_category;
 } // END hesk_kb_search()
 
 
@@ -233,132 +227,163 @@ function hesk_show_kb_article($artid)
     // Update views by 1
     hesk_dbQuery('UPDATE `'.hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` SET `views`=`views`+1 WHERE `id`={$artid} LIMIT 1");
 
-    echo '<h3>'.$article['subject'].'</h3>
-        <div class="footerWithBorder blankSpace"></div>
+?>
+	<section class="content">
+		<div class="box">
+			<div class="box-header with-border">
+				<h1 class="box-title">
+					<?php echo $article['subject']; ?>
+				</h1>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" data-widget="collapse">
+						<i class="fa fa-minus"></i>
+					</button>
+				</div>
+			</div>
+			<div class="box-body">
+				<?php echo $article['content']; ?>
+			</div>
+			<?php if (!empty($article['attachments'])): ?>
+			<div class="box-footer">
+				<p><b><?php echo $hesklang['attachments']; ?></b></p>
+				<?php
+				$att=explode(',',substr($article['attachments'], 0, -1));
+				foreach ($att as $myatt)
+				{
+					list($att_id, $att_name) = explode('#', $myatt);
+					echo '<i class="fa fa-paperclip"></i> <a href="../download_attachment.php?kb_att='.$att_id.'" rel="nofollow">'.$att_name.'</a><br />';
+				}
+				?>
+			</div>
+			<?php endif; ?>
+		</div>
+		<?php
 
-
-
-	<h4>'.$hesklang['as'].'</h4>
-    '. $article['content'];
-
-    if ( ! empty($article['attachments']))
-    {
-		echo '<p><b>'.$hesklang['attachments'].':</b><br />';
-		$att=explode(',',substr($article['attachments'], 0, -1));
-		foreach ($att as $myatt)
-        {
-			list($att_id, $att_name) = explode('#', $myatt);
-			echo '<i class="fa fa-papercip"></i> <a href="../download_attachment.php?kb_att='.$att_id.'" rel="nofollow">'.$att_name.'</a><br />';
+		if ($article['catid']==1)
+		{
+			$link = 'knowledgebase_private.php';
 		}
-		echo '</p>';
-    }
+		else
+		{
+			$link = 'knowledgebase_private.php?category='.$article['catid'];
+		}
+		?>
+		<br><br>
+		<div class="row">
+			<?php
+			$showRelated = false;
+			$column = 'col-md-12';
+			require(HESK_PATH . 'inc/mail/email_parser.php');
 
+			$query = hesk_dbEscape( $article['subject'] . ' ' . convert_html_to_text($article['content']) );
 
+			// Get relevant articles from the database
+			$res = hesk_dbQuery("SELECT `id`, `subject`, MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') AS `score` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') LIMIT ".intval($hesk_settings['kb_related']+1));
 
-    if ($article['catid']==1)
-    {
-    	$link = 'knowledgebase_private.php';
-    }
-    else
-    {
-    	$link = 'knowledgebase_private.php?category='.$article['catid'];
-    }
-    ?>
-    <br><br>
-    <div class="row">
-        <?php
-            $showRelated = false;
-            $column = 'col-md-12';
-            require(HESK_PATH . 'inc/mail/email_parser.php');
+			// Array with related articles
+			$related_articles = array();
 
-            $query = hesk_dbEscape( $article['subject'] . ' ' . convert_html_to_text($article['content']) );
+			while ($related = hesk_dbFetchAssoc($res))
+			{
+				// Get base match score from the first (this) article
+				if ( ! isset($base_score) )
+				{
+					$base_score = $related['score'];
+				}
 
-            // Get relevant articles from the database
-            $res = hesk_dbQuery("SELECT `id`, `subject`, MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') AS `score` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') LIMIT ".intval($hesk_settings['kb_related']+1));
+				// Ignore this article
+				if ($related['id'] == $artid)
+				{
+					continue;
+				}
 
-            // Array with related articles
-            $related_articles = array();
+				// Stop when articles reach less than 10% of base score
+				if ($related['score'] / $base_score < 0.10)
+				{
+					break;
+				}
 
-            while ($related = hesk_dbFetchAssoc($res))
-            {
-                // Get base match score from the first (this) article
-                if ( ! isset($base_score) )
-                {
-                    $base_score = $related['score'];
-                }
+				// This is a valid related article
+				$related_articles[$related['id']] = $related['subject'];
+			}
 
-                // Ignore this article
-                if ($related['id'] == $artid)
-                {
-                    continue;
-                }
+			// Print related articles if we have any valid matches
+			if ( count($related_articles) ) {
+				$column = 'col-md-6';
+				$showRelated = true;
+			}
+			?>
+			<div class="<?php echo $column; ?> col-sm-12">
+				<div class="box">
+					<div class="box-header with-border">
+						<h1 class="box-title">
+							<?php echo $hesklang['ad']; ?>
+						</h1>
+						<div class="box-tools pull-right">
+							<button type="button" class="btn btn-box-tool" data-widget="collapse">
+								<i class="fa fa-minus"></i>
+							</button>
+						</div>
+					</div>
+					<div class="box-body">
+						<table border="0">
+							<tr>
+								<td><?php echo $hesklang['aid']; ?>: </td>
+								<td><?php echo $article['id']; ?></td>
+							</tr>
+							<tr>
+								<td><?php echo $hesklang['category']; ?>: </td>
+								<td><a href="<?php echo $link; ?>"><?php echo $article['cat_name']; ?></a></td>
+							</tr>
+							<tr>
+								<td><?php echo $hesklang['dta']; ?>: </td>
+								<td><?php echo hesk_date($article['dt'], true); ?></td>
+							</tr>
+							<tr>
+								<td><?php echo $hesklang['views']; ?>: </td>
+								<td><?php echo (isset($_GET['rated']) ? $article['views'] : $article['views']+1); ?></td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+			<?php if ($showRelated) { ?>
+				<div class="col-md-6 col-sm-12">
+					<div class="box">
+						<div class="box-header with-border">
+							<h1 class="box-title">
+								<?php echo $hesklang['relart']; ?>
+							</h1>
+							<div class="box-tools pull-right">
+								<button type="button" class="btn btn-box-tool" data-widget="collapse">
+									<i class="fa fa-minus"></i>
+								</button>
+							</div>
+						</div>
+						<div class="box-body">
+							<?php
+							// Related articles
+							foreach ($related_articles as $id => $subject)
+							{
+								echo '<span class="glyphicon glyphicon-file" style="font-size: 16px;"></span> <a href="knowledgebase_private.php?article='.$id.'">'.$subject.'</a><br />';
+							}
+							?>
+						</div>
+					</div>
+				</div>
+			<?php } ?>
+		</div>
 
-                // Stop when articles reach less than 10% of base score
-                if ($related['score'] / $base_score < 0.10)
-                {
-                    break;
-                }
-
-                // This is a valid related article
-                $related_articles[$related['id']] = $related['subject'];
-            }
-
-            // Print related articles if we have any valid matches
-            if ( count($related_articles) ) {
-                $column = 'col-md-6';
-                $showRelated = true;
-            }
-        ?>
-        <div class="<?php echo $column; ?> col-sm-12">
-            <h4><?php echo $hesklang['ad']; ?></h4>
-            <div class="footerWithBorder blankSpace"></div>
-            <table border="0">
-                <tr>
-                    <td><?php echo $hesklang['aid']; ?>: </td>
-                    <td><?php echo $article['id']; ?></td>
-                </tr>
-                <tr>
-                    <td><?php echo $hesklang['category']; ?>: </td>
-                    <td><a href="<?php echo $link; ?>"><?php echo $article['cat_name']; ?></a></td>
-                </tr>
-                <tr>
-                    <td><?php echo $hesklang['dta']; ?>: </td>
-                    <td><?php echo hesk_date($article['dt'], true); ?></td>
-                </tr>
-                <tr>
-                    <td><?php echo $hesklang['views']; ?>: </td>
-                    <td><?php echo (isset($_GET['rated']) ? $article['views'] : $article['views']+1); ?></td>
-                </tr>
-            </table>
-        </div>
-        <?php if ($showRelated) { ?>
-        <div class="col-md-6 col-sm-12">
-            <h4><?php echo $hesklang['relart']; ?></h4>
-            <div class="footerWithBorder blankSpace"></div>
-            <?php
-            // Related articles
-            foreach ($related_articles as $id => $subject)
-            {
-                echo '<span class="glyphicon glyphicon-file" style="font-size: 16px;"></span> <a href="knowledgebase_private.php?article='.$id.'">'.$subject.'</a><br />';
-            }
-            ?>
-        </div>
-        <?php } ?>
-    </div>
-
-    <?php
-    if (!isset($_GET['back']))
-    {
-    	?>
-		<p><br /><a href="javascript:history.go(-1)"><span class="glyphicon glyphicon-circle-arrow-left"></span>&nbsp;<?php echo $hesklang['back']; ?></a></p>
-        <?php
-    }
-    else
-    {
-    	?>
-        <p>&nbsp;</p>
-        <?php
-    }
+		<?php
+		if (!isset($_GET['back']))
+		{
+			?>
+			<p><br /><a href="javascript:history.go(-1)"><span class="glyphicon glyphicon-circle-arrow-left"></span>&nbsp;<?php echo $hesklang['back']; ?></a></p>
+			<?php
+		}
+		?>
+	</section>
+<?php
 
 } // END hesk_show_kb_article()
 
@@ -370,148 +395,151 @@ function hesk_show_kb_category($catid, $is_search = 0) {
     {
 		/* Print header */
 		hesk_kb_header($hesk_settings['kb_link'], $catid);
-
-		if ($catid == 1)
-	    {
-	    	echo $hesklang['priv'];
-	    }
     }
 
     $res = hesk_dbQuery("SELECT `name`,`parent` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `id`='".intval($catid)."' LIMIT 1");
     $thiscat = hesk_dbFetchAssoc($res) or hesk_error($hesklang['kb_cat_inv']);
 
-	if ($thiscat['parent'])
-	{
-		$link = ($thiscat['parent'] == 1) ? 'knowledgebase_private.php' : 'knowledgebase_private.php?category='.$thiscat['parent'];
-		echo '<h3>'.$hesklang['kb_cat'].': '.$thiscat['name'].'</h3>
-        <p align="left"><a href="javascript:history.go(-1)"><span class="glyphicon glyphicon-circle-arrow-left"></span>'.$hesklang['back'].'</a></p>
-        <div class="footerWithBorder blankSpace"></div>';
-	}
-
-    $result = hesk_dbQuery("SELECT `id`,`name`,`articles`,`type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `parent`='".intval($catid)."' ORDER BY `parent` ASC, `cat_order` ASC");
-	if (hesk_dbNumRows($result) > 0)
-	{
-        ?>
-
-		<h4><?php echo $hesklang['kb_cat_sub']; ?></h4>
-        <div class="footerWithBorder blankSpace"></div>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-	<td>
-
-		<table border="0" cellspacing="1" cellpadding="3" width="100%">
-
+?>
+	<section class="content">
+		<?php if ($thiscat['parent']): ?>
+			<h3><?php echo $hesklang['kb_cat'].': '.$thiscat['name']; ?></h3>
+        	<p align="left"><a href="javascript:history.go(-1)">
+					<span class="glyphicon glyphicon-circle-arrow-left"></span>
+					<?php echo $hesklang['back']; ?>
+			</a></p>
 		<?php
-		$per_col = $hesk_settings['kb_cols'];
-		$i = 1;
+		endif;
 
-		while ($cat = hesk_dbFetchAssoc($result))
-		{
+		$result = hesk_dbQuery("SELECT `id`,`name`,`articles`,`type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `parent`='".intval($catid)."' ORDER BY `parent` ASC, `cat_order` ASC");
 
-			if ($i == 1)
-		    {
-				echo '<tr>';
-		    }
+		if (hesk_dbNumRows($result) > 0) {
+		?>
+		<div class="box">
+			<div class="box-header with-border">
+				<h1 class="box-title">
+					<?php echo $hesklang['kb_cat_sub']; ?>
+				</h1>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" data-widget="collapse">
+						<i class="fa fa-minus"></i>
+					</button>
+				</div>
+			</div>
+			<div class="box-body">
+				<table class="table table-striped">
+					<?php
+					$per_col = $hesk_settings['kb_cols'];
+					$i = 1;
 
-            $private = ($cat['type'] == 1) ? ' *' : '';
+					while ($cat = hesk_dbFetchAssoc($result))
+					{
 
-			echo '
+						if ($i == 1)
+						{
+							echo '<tr>';
+						}
+
+						$private = ($cat['type'] == 1) ? ' *' : '';
+
+						echo '
 		    <td width="50%" valign="top">
 			<table border="0">
 			<tr><td><span class="glyphicon glyphicon-folder-close"></span>&nbsp;<a href="knowledgebase_private.php?category='.$cat['id'].'">'.$cat['name'].'</a>'.$private.'</td></tr>
 			';
 
-			/* Print most popular/sticky articles */
-			if ($hesk_settings['kb_numshow'] && $cat['articles'])
-		    {
-		        $res = hesk_dbQuery("SELECT `id`,`subject`,`type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='".intval($cat['id'])."' AND `type` IN ('0','1') ORDER BY `sticky` DESC, `views` DESC, `art_order` ASC LIMIT " . (intval($hesk_settings['kb_numshow']) + 1) );
-		        $num = 1;
-				while ($art = hesk_dbFetchAssoc($res))
-				{
-                	$private = ($art['type'] == 1) ? ' *' : '';
-					echo '
+						/* Print most popular/sticky articles */
+						if ($hesk_settings['kb_numshow'] && $cat['articles'])
+						{
+							$res = hesk_dbQuery("SELECT `id`,`subject`,`type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='".intval($cat['id'])."' AND `type` IN ('0','1') ORDER BY `sticky` DESC, `views` DESC, `art_order` ASC LIMIT " . (intval($hesk_settings['kb_numshow']) + 1) );
+							$num = 1;
+							while ($art = hesk_dbFetchAssoc($res))
+							{
+								$private = ($art['type'] == 1) ? ' *' : '';
+								echo '
 		            <tr>
 		            <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-file"></span>
 		            <a href="knowledgebase_private.php?article='.$art['id'].'" class="article">'.$art['subject'].'</a>'.$private.'</td>
 		            </tr>';
 
-		            if ($num == $hesk_settings['kb_numshow'])
-		            {
-		            	break;
-		            }
-		            else
-		            {
-		            	$num++;
-		            }
-				}
-		        if (hesk_dbNumRows($res) > $hesk_settings['kb_numshow'])
-		        {
-		        	echo '<tr><td>&raquo; <a href="knowledgebase_private.php?category='.$cat['id'].'"><i>'.$hesklang['m'].'</i></a></td></tr>';
-		        }
-		    }
+								if ($num == $hesk_settings['kb_numshow'])
+								{
+									break;
+								}
+								else
+								{
+									$num++;
+								}
+							}
+							if (hesk_dbNumRows($res) > $hesk_settings['kb_numshow'])
+							{
+								echo '<tr><td>&raquo; <a href="knowledgebase_private.php?category='.$cat['id'].'"><i>'.$hesklang['m'].'</i></a></td></tr>';
+							}
+						}
 
-			echo '
+						echo '
 			</table>
 		    </td>
 			';
 
-			if ($i == $per_col)
-		    {
-				echo '</tr>';
-		        $i = 0;
-		    }
-			$i++;
-		}
-		/* Finish the table if needed */
-		if ($i != 1)
-		{
-			for ($j=1;$j<=$per_col;$j++)
-		    {
-				echo '<td width="50%">&nbsp;</td>';
-				if ($i == $per_col)
-			    {
-					echo '</tr>';
-			        break;
-			    }
-		        $i++;
-		    }
-		}
+						if ($i == $per_col)
+						{
+							echo '</tr>';
+							$i = 0;
+						}
+						$i++;
+					}
+					/* Finish the table if needed */
+					if ($i != 1)
+					{
+						for ($j=1;$j<=$per_col;$j++)
+						{
+							echo '<td width="50%">&nbsp;</td>';
+							if ($i == $per_col)
+							{
+								echo '</tr>';
+								break;
+							}
+							$i++;
+						}
+					}
 
-		?>
-		</table>
+					?>
+				</table>
+			</div>
+			<div class="box-footer">
+				<?php echo $hesklang['private_category_star']; ?>
+			</div>
+		</div>
+		<?php } ?>
+		<div class="box">
+			<div class="box-header with-border">
+				<h1 class="box-title">
+					<?php echo $hesklang['ac']; ?>
+				</h1>
+				<div class="box-tools pull-right">
+					<button type="button" class="btn btn-box-tool" data-widget="collapse">
+						<i class="fa fa-minus"></i>
+					</button>
+				</div>
+			</div>
+			<div class="box-body">
+				<?php
+				$res = hesk_dbQuery("SELECT `id`, `subject`, LEFT(`content`, ".max(200, $hesk_settings['kb_substrart'] * 2).") AS `content`, `rating`, `type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='".intval($catid)."' AND `type` IN ('0','1') ORDER BY `sticky` DESC, `art_order` ASC");
+				if (hesk_dbNumRows($res) == 0)
+				{
+					echo '<i>'.$hesklang['noac'].'</i>';
+				}
+				else
+				{
+					echo '<table border="0" cellspacing="1" cellpadding="3" width="100%">';
+					while ($article = hesk_dbFetchAssoc($res))
+					{
+						$private = ($article['type'] == 1) ? ' *' : '';
 
-	</td>
-</tr>
-</table>
+						$txt = hesk_kbArticleContentPreview($article['content']);
 
-	<?php
-	} // END if NumRows > 0
-	?>
-    <br>
-	<h4><?php echo $hesklang['ac']; ?></h4>
-    <div class="footerWithBorder blankSpace"></div>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-	<td>
-
-	<?php
-    $res = hesk_dbQuery("SELECT `id`, `subject`, LEFT(`content`, ".max(200, $hesk_settings['kb_substrart'] * 2).") AS `content`, `rating`, `type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='".intval($catid)."' AND `type` IN ('0','1') ORDER BY `sticky` DESC, `art_order` ASC");
-	if (hesk_dbNumRows($res) == 0)
-	{
-		echo '<p><i>'.$hesklang['noac'].'</i></p>';
-	}
-	else
-	{
-			echo '<div align="center"><table border="0" cellspacing="1" cellpadding="3" width="100%">';
-			while ($article = hesk_dbFetchAssoc($res))
-			{
-            	$private = ($article['type'] == 1) ? ' *' : '';
-
-	            $txt = hesk_kbArticleContentPreview($article['content']);
-
-				echo '
+						echo '
 				<tr>
 				<td>
 	                <table border="0" width="100%" cellspacing="0" cellpadding="1">
@@ -528,14 +556,16 @@ function hesk_show_kb_category($catid, $is_search = 0) {
 	                </table>
 	            </td>
 				</tr>';
-			}
-		    echo '</table></div>';
-	}
-	?>
-
-	</td>
-</tr>
-</table>
+					}
+					echo '</table>';
+				}
+				?>
+			</div>
+			<div class="box-footer">
+				<?php echo $hesklang['private_article_star']; ?>
+			</div>
+		</div>
+	</section>
 <?php
 } // END hesk_show_kb_category()
 
diff --git a/admin/mail.php b/admin/mail.php
index 7c925a5f..f3a5ac7c 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_MAIL');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -124,51 +125,72 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
     //-->
 </script>
 
-<div class="row move-down-20">
-    <div class="col-md-3">
-        <div class="panel panel-default">
-            <div class="panel-heading"><?php echo $hesklang['navigation']; ?></div>
-            <ul class="list-group">
-                <?php
-                /* Print sub-navigation */
-                echo
-                    '<li class="list-group-item">' . $hesk_settings['mailtmp']['inbox'] . '</li>
-            <li class="list-group-item">' . $hesk_settings['mailtmp']['outbox'] . '</li>
-            <li class="list-group-item">' . $hesk_settings['mailtmp']['new'] . '</li>';
-                ?>
-            </ul>
+<section class="content">
+    <div class="row">
+        <div class="col-md-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['navigation']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <ul class="products-list product-list-in-box">
+                        <li class="item">
+                            <?php echo $hesk_settings['mailtmp']['inbox']; ?>
+                        </li>
+                        <li class="item">
+                            <?php echo $hesk_settings['mailtmp']['outbox']; ?>
+                        </li>
+                        <li class="item">
+                            <?php echo $hesk_settings['mailtmp']['new']; ?>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-9">
+            <?php
+            hesk_handle_messages();
+            /* Show a message? */
+            if ($action == 'read') {
+                show_message();
+            }
+            if (!isset($_SESSION['hide']['list'])):
+            ?>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h1 class="box-title">
+                            <?php echo $hesklang['m_h']; ?>
+                        </h1>
+                        <div class="box-tools pull-right">
+                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                <i class="fa fa-minus"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="box-body">
+                        <?php mail_list_messages(); ?>
+                    </div>
+                </div>
+            <?php endif; ?>
+
+            <?php
+            /* Show new message form */
+            show_new_form();
+
+            /* Clean unneeded session variables */
+            hesk_cleanSessionVars('hide');
+            hesk_cleanSessionVars('mail');
+            ?>
         </div>
     </div>
-    <div class="col-md-7">
-        <h3><?php echo $hesklang['m_h']; ?></h3>
-
-        <div class="footerWithBorder blankSpace"></div>
-
-        <?php
-
-
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-
-        /* Show a message? */
-        if ($action == 'read') {
-            show_message();
-        }
-
-        /* Hide list of messages? */
-        if (!isset($_SESSION['hide']['list'])) {
-            mail_list_messages();
-        } // END hide list of messages
-
-        /* Show new message form */
-        show_new_form();
-
-        /* Clean unneeded session variables */
-        hesk_cleanSessionVars('hide');
-        hesk_cleanSessionVars('mail');
-        ?>
-    </div>
-</div>
+</section>
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
@@ -403,58 +425,62 @@ function show_message()
 	        }
 
 	        $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '<a href="mail.php?a=new&amp;id='.$pm[$hesk_settings['mailtmp']['other']].'">'.$admins[$pm[$hesk_settings['mailtmp']['other']]].'</a>' : (($pm['from'] == 9999) ? '<a href="http://www.hesk.com" target="_blank">HESK.com</a>' : $hesklang['e_udel']);
-	        
-            echo $pm['dt'];
             
             $pm['dt'] = hesk_dateToString($pm['dt'],0,1,0,true);
 			?>
+            <div class="box">
+                <div class="box-header with-border">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['private_message_header']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <div class="callout callout-info">
+                        <div class="row">
+                            <div class="col-md-4 col-sm-6">
+                                <b><?php echo $hesk_settings['mailtmp']['m_from']; ?></b>
+                                <?php echo $pm['name']; ?>
+                            </div>
+                            <div class="col-md-4 col-sm-6">
+                                <b><?php echo $hesklang['date_colon']; ?></b>
+                                <?php echo $pm['dt']; ?>
+                            </div>
+                            <div class="col-md-4 col-sm-6">
+                                <b><?php echo $hesklang['m_sub']; ?></b>
+                                <?php echo $pm['subject']; ?>
+                            </div>
+                        </div>
+                    </div>
+                    <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                        <tr>
+                            <td class="text-right" style="vertical-align:top;">
 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-            <td>
 
-                <table border="0" cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                <td valign="top">
-                    <table border="0">
-                    <tr>
-                        <td><b><?php echo $hesk_settings['mailtmp']['m_from']; ?></b></td>
-                        <td><?php echo $pm['name']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $hesklang['date']; ?></b></td>
-                        <td><?php echo $pm['dt']; ?></td>
-                    </tr>
-                    <tr>
-                        <td><b><?php echo $hesklang['m_sub']; ?></b></td>
-                        <td><?php echo $pm['subject']; ?></td>
-                    </tr>
+
+                            </td>
+                        </tr>
                     </table>
-                </td>
-                <td class="text-right" style="vertical-align:top;">
-
-                    <?php
-                    $folder = '&amp;folder=outbox';
-                    if ($pm['to'] == $_SESSION['id'])
-                    {
-                        echo '<a href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-envelope-o font-size-14p"></i></a> ';
-                        $folder = '';
-                    }
-                    echo '<a href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times font-size-14p red"></i></a>';
-                    ?>
-
-                </td>
-                </tr>
-                </table>
-
-            <p><?php echo $pm['message']; ?></p>
-
-            </td>
-            </tr>
-        </table>
-    </div><hr />
-
-
+                    <p><?php echo $pm['message']; ?></p>
+                </div>
+                <div class="box-footer">
+                    <div class="pull-right">
+                        <?php
+                        $folder = '&amp;folder=outbox';
+                        if ($pm['to'] == $_SESSION['id'])
+                        {
+                            echo '<a class="btn btn-default" href="mail.php?a=mark_unread&amp;id='.$id.'&amp;token='.hesk_token_echo(0).'"><i class="fa fa-envelope-o icon-link"></i> '.$hesklang['mau'].'</a> ';
+                            $folder = '';
+                        }
+                        echo '<a class="btn btn-danger" href="mail.php?a=delete&amp;id='.$id.'&amp;token='.hesk_token_echo(0).$folder.'" onclick="return hesk_confirmExecute(\''.hesk_makeJsString($hesklang['delm']).'?\');"><i class="fa fa-times icon-link"></i> '.$hesklang['delm'].'</a>';
+                        ?>
+                    </div>
+                </div>
+            </div>
 			<?php
 	    } // END if $num
 
@@ -547,7 +573,7 @@ function mail_list_messages()
                         <th><input type="checkbox" name="checkall" value="2" onclick="hesk_changeAll(this)"/></th>
                         <th><?php echo $hesklang['m_sub']; ?></th>
                         <th><?php echo $hesk_settings['mailtmp']['m_from']; ?></th>
-                        <th><?php echo $hesklang['date']; ?></th>
+                        <th><?php echo $hesklang['date_colon']; ?></th>
                     </tr>
                     </thead>
                     <tbody>
@@ -620,78 +646,89 @@ function show_new_form()
 {
 global $hesk_settings, $hesklang, $admins;
 ?>
-<br/>
+
 <form action="mail.php" method="post" name="form2" class="form-horizontal" role="form" data-toggle="validator">
-    <h3><?php echo $hesklang['new_mail']; ?></h3>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['new_mail']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <div class="form-group">
+                <label for="to" class="col-sm-3 control-label"><?php echo $hesklang['m_to']; ?></label>
 
-    <div class="footerWithBorder blankSpace"></div>
-
-    <div class="form-group">
-        <label for="to" class="col-sm-3 control-label"><?php echo $hesklang['m_to']; ?></label>
-
-        <div class="col-sm-9">
-            <select class="form-control" name="to" type="number"
-                    data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>" required>
-                <option value="" selected="selected"><?php echo $hesklang['select']; ?></option>
-                <?php
-                foreach ($admins as $k => $v) {
-                    if ($k != $_SESSION['id']) {
-                        if (isset($_SESSION['mail']) && $k == $_SESSION['mail']['to']) {
-                            echo '<option value="' . $k . '" selected="selected">' . $v . '</option>';
-                        } else {
-                            echo '<option value="' . $k . '">' . $v . '</option>';
+                <div class="col-sm-9">
+                    <select class="form-control" name="to" type="number"
+                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>" required>
+                        <option value="" selected="selected"><?php echo $hesklang['select']; ?></option>
+                        <?php
+                        foreach ($admins as $k => $v) {
+                            if ($k != $_SESSION['id']) {
+                                if (isset($_SESSION['mail']) && $k == $_SESSION['mail']['to']) {
+                                    echo '<option value="' . $k . '" selected="selected">' . $v . '</option>';
+                                } else {
+                                    echo '<option value="' . $k . '">' . $v . '</option>';
+                                }
+                            }
                         }
-                    }
-                }
-                ?>
-            </select>
-            <div class="help-block with-errors"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['m_sub']; ?></label>
+                        ?>
+                    </select>
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['m_sub']; ?></label>
 
-        <div class="col-sm-9">
-            <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"
-                   name="subject" size="40" maxlength="50"
-                <?php
-                if (isset($_SESSION['mail']['subject'])) {
-                    echo ' value="' . stripslashes($_SESSION['mail']['subject']) . '" ';
-                }
-                ?> data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>" required>
-            <div class="help-block with-errors"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>:</label>
+                <div class="col-sm-9">
+                    <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"
+                           name="subject" size="40" maxlength="50"
+                        <?php
+                        if (isset($_SESSION['mail']['subject'])) {
+                            echo ' value="' . stripslashes($_SESSION['mail']['subject']) . '" ';
+                        }
+                        ?> data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>" required>
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>:</label>
 
-        <div class="col-sm-9">
+                <div class="col-sm-9">
             <textarea name="message" class="form-control" data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                       placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" rows="15" cols="70" required><?php
                 if (isset($_SESSION['mail']['message'])) {
                     echo stripslashes($_SESSION['mail']['message']);
                 }
                 ?></textarea>
-            <div class="help-block with-errors"></div>
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-sm-9 col-sm-offset-3">
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" name="signature" value="1" checked>
-                    <?php echo $hesklang['attach_sign']; ?>
-                </label> (<a href="profile.php"><?php echo $hesklang['profile_settings']; ?></a>)
+                    <div class="help-block with-errors"></div>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-9 col-sm-offset-3">
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="signature" value="1" checked>
+                            <?php echo $hesklang['attach_sign']; ?>
+                        </label> (<a href="profile.php"><?php echo $hesklang['profile_settings']; ?></a>)
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-9 col-sm-offset-3">
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                    <input type="hidden" name="a" value="send"/>
+                    <input type="submit" value="<?php echo $hesklang['m_send']; ?>" class="btn btn-default"/>
+                </div>
             </div>
         </div>
     </div>
-    <div class="form-group">
-        <div class="col-sm-9 col-sm-offset-3">
-            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-            <input type="hidden" name="a" value="send"/>
-            <input type="submit" value="<?php echo $hesklang['m_send']; ?>" class="btn btn-default"/>
-        </div>
-    </div>
+</form>
     <?php
     } // END show_new_form()
     ?>
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 191ba920..dd7b4b56 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CANNED');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -125,82 +126,89 @@ $i = 1;
 $j = 0;
 $num = hesk_dbNumRows($result);
 ?>
-<div class="row move-down-20">
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading"><?php echo $hesklang['savedResponses']; ?></div>
-            <div class="panel-body">
-                <?php if ($num < 1)
-                {
-                    echo '<p>' . $hesklang['no_saved'] . '</p>';
-                }
-                else
-                { ?>
-                <table class="table table-hover">
-                    <tr>
-                        <th><?php echo $hesklang['saved_title']; ?></th>
-                        <th><?php echo $hesklang['opt']; ?></th>
-                    </tr>
-                    <?php
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['savedResponses']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php if ($num < 1)
+            {
+                echo '<p>' . $hesklang['no_saved'] . '</p>';
+            }
+            else
+            { ?>
+            <table class="table table-hover">
+                <tr>
+                    <th><?php echo $hesklang['saved_title']; ?></th>
+                    <th><?php echo $hesklang['opt']; ?></th>
+                </tr>
+                <?php
 
-                    while ($mysaved = hesk_dbFetchAssoc($result)) {
-                        $j++;
+                while ($mysaved = hesk_dbFetchAssoc($result)) {
+                    $j++;
 
-                        if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2']) {
-                            $color = 'admin_green';
-                            unset($_SESSION['canned']['selcat2']);
-                        } else {
-                            $color = $i ? 'admin_white' : 'admin_gray';
-                        }
+                    if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2']) {
+                        $color = 'admin_green';
+                        unset($_SESSION['canned']['selcat2']);
+                    } else {
+                        $color = $i ? 'admin_white' : 'admin_gray';
+                    }
 
-                        $tmp = $i ? 'White' : 'Blue';
-                        $style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"';
-                        $i = $i ? 0 : 1;
+                    $tmp = $i ? 'White' : 'Blue';
+                    $style = 'class="option' . $tmp . 'OFF" onmouseover="this.className=\'option' . $tmp . 'ON\'" onmouseout="this.className=\'option' . $tmp . 'OFF\'"';
+                    $i = $i ? 0 : 1;
 
-                        $options .= '<option value="' . $mysaved['id'] . '"';
-                        $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
-                        $options .= '>' . $mysaved['title'] . '</option>';
+                    $options .= '<option value="' . $mysaved['id'] . '"';
+                    $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
+                    $options .= '>' . $mysaved['title'] . '</option>';
 
 
-                        $javascript_titles .= 'myTitle[' . $mysaved['id'] . ']=\'' . addslashes($mysaved['title']) . "';\n";
-                        if ($modsForHesk_settings['rich_text_for_tickets']) {
-                            $theMessage = hesk_html_entity_decode($mysaved['message']);
-                            $theMessage = addslashes($theMessage);
-                            $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", $theMessage) . "';\n";
-                        } else {
-                            $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", addslashes($mysaved['message'])) . "';\n";
-                        }
+                    $javascript_titles .= 'myTitle[' . $mysaved['id'] . ']=\'' . addslashes($mysaved['title']) . "';\n";
+                    if ($modsForHesk_settings['rich_text_for_tickets']) {
+                        $theMessage = hesk_html_entity_decode($mysaved['message']);
+                        $theMessage = addslashes($theMessage);
+                        $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", $theMessage) . "';\n";
+                    } else {
+                        $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", addslashes($mysaved['message'])) . "';\n";
+                    }
 
-                        echo '
+                    echo '
                         <tr>
                         <td>' . $mysaved['title'] . '</td>
                         <td>
                         ';
 
-                        if ($num > 1) {
-                            if ($j == 1) {
-                                echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>';
-                            } elseif ($j == $num) {
-                                echo '<a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                            } else {
-                                echo '
+                    if ($num > 1) {
+                        if ($j == 1) {
+                            echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>';
+                        } elseif ($j == $num) {
+                            echo '<a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                        } else {
+                            echo '
                                 <a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a>
                                 <a href="manage_canned.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>
                                 ';
-                            }
-                        } else {
-                            echo '';
                         }
+                    } else {
+                        echo '';
+                    }
 
-                        echo '
+                    echo '
                         <a href="manage_canned.php?a=remove&amp;id=' . $mysaved['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>&nbsp;</td>
                         </tr>
                         ';
-                    } // End while
-                    }
-                    ?>
-                </table>
-            </div>
+                } // End while
+            }
+            ?>
+            </table>
         </div>
     </div>
     <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
@@ -225,117 +233,123 @@ $num = hesk_dbNumRows($result);
             /* ]]> */
         </script>
     <?php endif; ?>
-    <div class="col-md-8">
-        <script language="javascript" type="text/javascript"><!--
-            // -->
-            var myMsgTxt = new Array();
-            var myTitle = new Array();
-            myMsgTxt[0] = '';
-            myTitle[0] = '';
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['manage_saved']; ?> <a href="javascript:void(0)"
+                                                            onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['manage_intro']); ?>')"><i
+                        class="fa fa-question-circle settingsquestionmark"></i></a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <script language="javascript" type="text/javascript"><!--
+                // -->
+                var myMsgTxt = new Array();
+                var myTitle = new Array();
+                myMsgTxt[0] = '';
+                myTitle[0] = '';
 
-            <?php
-            echo $javascript_titles;
-            echo $javascript_messages;
-            ?>
+                <?php
+                echo $javascript_titles;
+                echo $javascript_messages;
+                ?>
 
-            function setMessage(msgid) {
-                var useHtmlEditor = <?php echo $modsForHesk_settings['rich_text_for_tickets']; ?>;
-                var myMsg = myMsgTxt[msgid];
-                var mySubject = myTitle[msgid];
+                function setMessage(msgid) {
+                    var useHtmlEditor = <?php echo $modsForHesk_settings['rich_text_for_tickets']; ?>;
+                    var myMsg = myMsgTxt[msgid];
+                    var mySubject = myTitle[msgid];
 
-                if (myMsg == '') {
-                    if (useHtmlEditor) {
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                    if (myMsg == '') {
+                        if (useHtmlEditor) {
+                            tinymce.get("message").setContent('');
+                            tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                        }
+                        else {
+                            $('#message').val('');
+                        }
+                        $('#subject').val('');
+                        return true;
+                    }
+                    if (document.getElementById) {
+                        if (useHtmlEditor) {
+                            tinymce.get("message").setContent('');
+                            tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                        } else {
+                            myMsg = $('<textarea />').html(myMsg).text();
+                            $('#message').val(myMsg).trigger('input');
+                        }
+                        mySubject = $('<textarea />').html(mySubject).text();
+                        $('#subject').val(mySubject).trigger('input');
                     }
                     else {
-                        $('#message').val('');
+                        document.form1.message.value = myMsg;
+                        document.form1.subject.value = mySubject;
                     }
-                    $('#subject').val('');
-                    return true;
-                }
-                if (document.getElementById) {
-                    if (useHtmlEditor) {
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+
+                    if (msgid == 0) {
+                        document.form1.a[0].checked = true;
                     } else {
-                        myMsg = $('<textarea />').html(myMsg).text();
-                        $('#message').val(myMsg).trigger('input');
+                        document.form1.a[1].checked = true;
                     }
-                    mySubject = $('<textarea />').html(mySubject).text();
-                    $('#subject').val(mySubject).trigger('input');
-                }
-                else {
-                    document.form1.message.value = myMsg;
-                    document.form1.subject.value = mySubject;
-                }
 
-                if (msgid == 0) {
-                    document.form1.a[0].checked = true;
-                } else {
-                    document.form1.a[1].checked = true;
                 }
-
+                //-->
+            </script>
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
+            ?>
+            <?php
+            $onsubmit = '';
+            if ($modsForHesk_settings['rich_text_for_tickets']) {
+                $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
             }
-            //-->
-        </script>
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-        ?>
-        <h3><?php echo $hesklang['manage_saved']; ?> <a href="javascript:void(0)"
-                                                        onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['manage_intro']); ?>')"><i
-                    class="fa fa-question-circle settingsquestionmark"></i></a></h3>
-
-        <div class="footerWithBorder blankSpace"></div>
-
-        <?php
-        $onsubmit = '';
-        if ($modsForHesk_settings['rich_text_for_tickets']) {
-            $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
-        }
-        ?>
-        <form action="manage_canned.php" method="post" name="form1" class="form-horizontal" role="form" data-toggle="validator" <?php echo $onsubmit; ?>>
-            <h3><?php echo $hesklang['new_saved']; ?></h3>
-
-            <div class="footerWithBorder blankSpace"></div>
-            <div class="form-group">
-                <div class="col-sm-12">
-                    <?php
-                    if ($num > 0) {
-                        ?>
-                        <div class="col-sm-12">
-                            <div class="radio">
-                                <label><input type="radio" name="a"
-                                              value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_add']; ?>
-                                </label>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-6">
-                                <div class="radio">
-                                    <label><input type="radio" name="a"
-                                                  value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_edit']; ?>
-                                    </label>:
+            ?>
+            <form action="manage_canned.php" method="post" name="form1" class="form-horizontal" role="form" data-toggle="validator" <?php echo $onsubmit; ?>>
+                <div class="form-group">
+                    <div class="col-sm-12">
+                        <?php
+                        if ($num > 0) {
+                            ?>
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="radio">
+                                        <label><input type="radio" name="a"
+                                                      value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_add']; ?>
+                                        </label>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="col-sm-6">
-                                <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
-                                    <option value="0"> - <?php echo $hesklang['select_empty']; ?>-
-                                    </option><?php echo $options; ?></select>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="radio">
+                                        <label><input type="radio" name="a"
+                                                      value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_edit']; ?>
+                                        </label>:
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
+                                        <option value="0"> - <?php echo $hesklang['select_empty']; ?>-
+                                        </option><?php echo $options; ?></select>
+                                </div>
                             </div>
-                        </div>
-                        <?php
-                    } else {
-                        echo '<input type="hidden" name="a" value="new" /><label> ' . $hesklang['canned_add'] . '</label>';
-                    }
-                    ?>
+                            <?php
+                        } else {
+                            echo '<input type="hidden" name="a" value="new" /><label> ' . $hesklang['canned_add'] . '</label>';
+                        }
+                        ?>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['saved_title']; ?></label>
+                <div class="form-group">
+                    <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['saved_title']; ?></label>
 
-                <div class="col-sm-10">
+                    <div class="col-sm-10">
                     <span id="HeskTitle"><input id="subject" class="form-control"
                                                 placeholder="<?php echo htmlspecialchars($hesklang['saved_title']); ?>"
                                                 type="text" name="name" size="40"
@@ -343,13 +357,13 @@ $num = hesk_dbNumRows($result);
                                                 maxlength="50" <?php if (isset($_SESSION['canned']['name'])) {
                             echo ' value="' . stripslashes($_SESSION['canned']['name']) . '" ';
                         } ?> required></span>
-                    <div class="help-block with-errors"></div>
+                        <div class="help-block with-errors"></div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" id="message-group">
-                <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?></label>
+                <div class="form-group" id="message-group">
+                    <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?></label>
 
-                <div class="col-sm-10">
+                    <div class="col-sm-10">
                     <span id="HeskMsg">
                         <textarea id="message" class="htmlEditor form-control"
                                   placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="msg"
@@ -360,38 +374,39 @@ $num = hesk_dbNumRows($result);
                             }
                             ?></textarea>
                     </span>
-                    <div class="help-block with-errors" id="message-help-block"></div>
-                    <?php echo $hesklang['insert_special']; ?>:
-                    <a href="javascript:void(0)"
-                       onclick="hesk_insertTag('HESK_ID')"><?php echo $hesklang['seqid']; ?></a> |
-                    <a href="javascript:void(0)"
-                       onclick="hesk_insertTag('HESK_TRACK_ID')"><?php echo $hesklang['trackID']; ?></a> |
-                    <a href="javascript:void(0)"
-                       onclick="hesk_insertTag('HESK_NAME')"><?php echo $hesklang['name']; ?></a> |
-                    <a href="javascript:void(0)"
-                       onclick="hesk_insertTag('HESK_EMAIL')"><?php echo $hesklang['email']; ?></a> |
-                    <a href="javascript:void(0)"
-                       onclick="hesk_insertTag('HESK_OWNER')"><?php echo $hesklang['owner']; ?></a>
-                    <?php
-                    foreach ($hesk_settings['custom_fields'] as $k => $v) {
-                        if ($v['use']) {
-                            if ($modsForHesk_settings['custom_field_setting']) {
-                                $v['name'] = $hesklang[$v['name']];
-                            }
+                        <div class="help-block with-errors" id="message-help-block"></div>
+                        <?php echo $hesklang['insert_special']; ?>:
+                        <a href="javascript:void(0)"
+                           onclick="hesk_insertTag('HESK_ID')"><?php echo $hesklang['seqid']; ?></a> |
+                        <a href="javascript:void(0)"
+                           onclick="hesk_insertTag('HESK_TRACK_ID')"><?php echo $hesklang['trackID']; ?></a> |
+                        <a href="javascript:void(0)"
+                           onclick="hesk_insertTag('HESK_NAME')"><?php echo $hesklang['name']; ?></a> |
+                        <a href="javascript:void(0)"
+                           onclick="hesk_insertTag('HESK_EMAIL')"><?php echo $hesklang['email']; ?></a> |
+                        <a href="javascript:void(0)"
+                           onclick="hesk_insertTag('HESK_OWNER')"><?php echo $hesklang['owner']; ?></a>
+                        <?php
+                        foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                            if ($v['use']) {
+                                if ($modsForHesk_settings['custom_field_setting']) {
+                                    $v['name'] = $hesklang[$v['name']];
+                                }
 
-                            echo '| <a href="javascript:void(0)" onclick="hesk_insertTag(\'HESK_' . $k . '\')">' . $v['name'] . '</a> ';
+                                echo '| <a href="javascript:void(0)" onclick="hesk_insertTag(\'HESK_' . $k . '\')">' . $v['name'] . '</a> ';
+                            }
                         }
-                    }
-                    ?>
+                        ?>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group text-center">
-                <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-default"/>
-            </div>
-        </form>
+                <div class="form-group text-center">
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                    <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-default"/>
+                </div>
+            </form>
+        </div>
     </div>
-</div>
+</section>
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 9b8a9dc0..aaf9df54 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CATEGORIES');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -49,9 +50,9 @@ hesk_checkPermission('can_man_cat');
 // Possible priorities
 $priorities = array(
     3 => array('value' => 3, 'text' => $hesklang['low'], 'formatted' => $hesklang['low']),
-    2 => array('value' => 2, 'text' => $hesklang['medium'], 'formatted' => '<font class="medium">' . $hesklang['medium'] . '</font>'),
-    1 => array('value' => 1, 'text' => $hesklang['high'], 'formatted' => '<font class="important">' . $hesklang['high'] . '</font>'),
-    0 => array('value' => 0, 'text' => $hesklang['critical'], 'formatted' => '<font class="critical">' . $hesklang['critical'] . '</font>'),
+    2 => array('value' => 2, 'text' => $hesklang['medium'], 'formatted' => '<span class="medium">' . $hesklang['medium'] . '</span>'),
+    1 => array('value' => 1, 'text' => $hesklang['high'], 'formatted' => '<span class="important">' . $hesklang['high'] . '</span>'),
+    0 => array('value' => 0, 'text' => $hesklang['critical'], 'formatted' => '<span class="critical">' . $hesklang['critical'] . '</span>'),
 );
 
 /* What should we do? */
@@ -106,221 +107,232 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
     $options .= '>' . $mycat['name'] . '</option>';
 }
 ?>
-<div class="row move-down-20">
-    <div align="left" class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+<section class="content">
+    <div class="box collapsed-box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
                 <?php echo $hesklang['add_cat']; ?>
-            </div>
-            <div class="panel-body">
-                <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
-                    <div class="form-group">
-                        <p class="col-sm-4 control-label" style="font-size: .87em">
-                            <b><?php echo $hesklang['cat_name']; ?></b> (<?php echo $hesklang['max_chars']; ?>)</p>
-
-                        <div class="col-sm-8">
-                            <input class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text"
-                                   name="name" size="40" maxlength="40"
-                                <?php
-                                if (isset($_SESSION['catname'])) {
-                                    echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
-                                }
-                                ?>
-                                   data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>"
-                                   required>
-                            <div class="help-block with-errors"></div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="priority" class="col-sm-4 control-label"
-                               style="font-size: .87em"><?php echo $hesklang['def_pri']; ?> <a href="#"
-                                    onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
-
-                        <div class="col-sm-8">
-                            <select name="priority" class="form-control">
-                                <?php
-                                // Default priority: low
-                                if (!isset($_SESSION['cat_priority'])) {
-                                    $_SESSION['cat_priority'] = 3;
-                                }
-
-                                // List possible priorities
-                                foreach ($priorities as $value => $info) {
-                                    echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
-                                }
-                                ?>
-                            </select></p>
-
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="color" class="col-sm-4 control-label">
-                            <?php echo $hesklang['category_color']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
-                               data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
-                        </label>
-                        <div class="col-sm-8">
-                            <input class="form-control colorpicker-trigger"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
-                                   name="color" maxlength="7">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="usage" class="col-sm-4 control-label"><?php echo $hesklang['usage']; ?></label>
-                        <div class="col-sm-8">
-                            <select name="usage" class="form-control">
-                                <option value="0"><?php echo $hesklang['tickets_and_events']; ?></option>
-                                <option value="1"><?php echo $hesklang['tickets_only']; ?></option>
-                                <option value="2"><?php echo $hesklang['events_only']; ?></option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?></label>
-
-                        <div class="col-sm-8">
-                            <?php
-                            if ($hesk_settings['autoassign']) {
-                                ?>
-                                <div class="checkbox">
-                                    <label><input type="checkbox" name="autoassign"
-                                                  value="Y" <?php if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
-                                            echo 'checked="checked"';
-                                        } ?> /> <?php echo $hesklang['cat_aa']; ?></label><br/>
-                                </div>
-                                <?php
-                            }
-                            ?>
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="type"
-                                              value="Y" <?php if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
-                                        echo 'checked="checked"';
-                                    } ?> /> <?php echo $hesklang['cat_type']; ?></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group text-center">
-                        <input type="hidden" name="a" value="new"/>
-                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                        <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
-                    </div>
-                </form>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-plus"></i>
+                </button>
             </div>
         </div>
+        <div class="box-body">
+            <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
+                <div class="form-group">
+                    <p class="col-sm-4 control-label" style="font-size: .87em">
+                        <b><?php echo $hesklang['cat_name']; ?></b> (<?php echo $hesklang['max_chars']; ?>)</p>
+
+                    <div class="col-sm-8">
+                        <input class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text"
+                               name="name" size="40" maxlength="40"
+                            <?php
+                            if (isset($_SESSION['catname'])) {
+                                echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
+                            }
+                            ?>
+                               data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>"
+                               required>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="priority" class="col-sm-4 control-label"
+                           style="font-size: .87em"><?php echo $hesklang['def_pri']; ?> <a href="#"
+                                                                                           onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
+
+                    <div class="col-sm-8">
+                        <select name="priority" class="form-control">
+                            <?php
+                            // Default priority: low
+                            if (!isset($_SESSION['cat_priority'])) {
+                                $_SESSION['cat_priority'] = 3;
+                            }
+
+                            // List possible priorities
+                            foreach ($priorities as $value => $info) {
+                                echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
+                            }
+                            ?>
+                        </select>
+
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="color" class="col-sm-4 control-label">
+                        <?php echo $hesklang['category_color']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
+                           data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                    </label>
+                    <div class="col-sm-8">
+                        <input class="form-control colorpicker-trigger"
+                               placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
+                               name="color" maxlength="7">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="usage" class="col-sm-4 control-label"><?php echo $hesklang['usage']; ?></label>
+                    <div class="col-sm-8">
+                        <select name="usage" class="form-control">
+                            <option value="0"><?php echo $hesklang['tickets_and_events']; ?></option>
+                            <option value="1"><?php echo $hesklang['tickets_only']; ?></option>
+                            <option value="2"><?php echo $hesklang['events_only']; ?></option>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?></label>
+
+                    <div class="col-sm-8">
+                        <?php
+                        if ($hesk_settings['autoassign']) {
+                            ?>
+                            <div class="checkbox">
+                                <label><input type="checkbox" name="autoassign"
+                                              value="Y" <?php if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
+                                        echo 'checked="checked"';
+                                    } ?> /> <?php echo $hesklang['cat_aa']; ?></label><br/>
+                            </div>
+                            <?php
+                        }
+                        ?>
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="type"
+                                          value="Y" <?php if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
+                                    echo 'checked="checked"';
+                                } ?> /> <?php echo $hesklang['cat_type']; ?></label>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group text-center">
+                    <input type="hidden" name="a" value="new"/>
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                    <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
+                </div>
+            </form>
+        </div>
     </div>
-    <div class="col-md-8">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
                 <?php echo $hesklang['manage_cat']; ?> <a href="javascript:void(0)"
                                                           onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['cat_intro']); ?>')"><i
                         class="fa fa-question-circle settingsquestionmark"></i></a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
-            <div class="panel-body">
+        </div>
+        <div class="box-body">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
+
+            if ($hesk_settings['cust_urgency']) {
+                hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']);
+            }
+            ?>
+            <table class="table table-hover">
+                <tr>
+                    <th style="display: none"><?php echo $hesklang['id']; ?></th>
+                    <th><?php echo $hesklang['cat_name']; ?></th>
+                    <th><?php echo $hesklang['priority']; ?></th>
+                    <th><?php echo $hesklang['not']; ?></th>
+                    <th><?php echo $hesklang['graph']; ?></th>
+                    <th><?php echo $hesklang['usage']; ?></th>
+                    <th><?php echo $hesklang['manager']; ?></th>
+                    <th><?php echo $hesklang['opt']; ?></th>
+                </tr>
+
                 <?php
-                /* This will handle error, success and notice messages */
-                hesk_handle_messages();
+                /* Get number of tickets per category */
+                $tickets_all = array();
+                $tickets_total = 0;
 
-                if ($hesk_settings['cust_urgency']) {
-                    hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']);
+                $res = hesk_dbQuery('SELECT COUNT(*) AS `cnt`, `category` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` GROUP BY `category`');
+                while ($tmp = hesk_dbFetchAssoc($res)) {
+                    $tickets_all[$tmp['category']] = $tmp['cnt'];
+                    $tickets_total += $tmp['cnt'];
                 }
-                ?>
-                <table class="table table-hover">
-                    <tr>
-                        <th style="display: none"><?php echo $hesklang['id']; ?></th>
-                        <th><?php echo $hesklang['cat_name']; ?></th>
-                        <th><?php echo $hesklang['priority']; ?></th>
-                        <th><?php echo $hesklang['not']; ?></th>
-                        <th><?php echo $hesklang['graph']; ?></th>
-                        <th><?php echo $hesklang['usage']; ?></th>
-                        <th><?php echo $hesklang['manager']; ?></th>
-                        <th><?php echo $hesklang['opt']; ?></th>
-                    </tr>
 
-                    <?php
-                    /* Get number of tickets per category */
-                    $tickets_all = array();
-                    $tickets_total = 0;
+                /* Get list of categories */
+                $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `" . $orderBy . "` ASC");
+                $usersRes = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `isadmin` = '0' ORDER BY `name` ASC");
+                $users = array();
+                while ($userRow = hesk_dbFetchAssoc($usersRes)) {
+                    array_push($users, $userRow);
+                }
 
-                    $res = hesk_dbQuery('SELECT COUNT(*) AS `cnt`, `category` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` GROUP BY `category`');
-                    while ($tmp = hesk_dbFetchAssoc($res)) {
-                        $tickets_all[$tmp['category']] = $tmp['cnt'];
-                        $tickets_total += $tmp['cnt'];
-                    }
+                $i = 1;
+                $j = 0;
+                $num = hesk_dbNumRows($res);
 
-                    /* Get list of categories */
-                    $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `" . $orderBy . "` ASC");
-                    $usersRes = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `isadmin` = '0' ORDER BY `name` ASC");
-                    $users = array();
-                    while ($userRow = hesk_dbFetchAssoc($usersRes)) {
-                        array_push($users, $userRow);
-                    }
-
-                    $i = 1;
-                    $j = 0;
-                    $num = hesk_dbNumRows($res);
-
-                    $usage = array(
-                        0 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i>
+                $usage = array(
+                    0 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i>
                                 <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>',
-                        1 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i><i class="fa fa-fw"></i>',
-                        2 => '<i class="fa fa-fw icon-link">&nbsp;</i> <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>'
-                    );
+                    1 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i><i class="fa fa-fw"></i>',
+                    2 => '<i class="fa fa-fw icon-link">&nbsp;</i> <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>'
+                );
 
-                    while ($mycat = hesk_dbFetchAssoc($res)) {
-                        $j++;
+                while ($mycat = hesk_dbFetchAssoc($res)) {
+                    $j++;
 
-                        if (isset($_SESSION['selcat2']) && $mycat['id'] == $_SESSION['selcat2']) {
-                            $color = 'admin_green';
-                            unset($_SESSION['selcat2']);
+                    if (isset($_SESSION['selcat2']) && $mycat['id'] == $_SESSION['selcat2']) {
+                        $color = 'admin_green';
+                        unset($_SESSION['selcat2']);
+                    } else {
+                        $color = $i ? 'admin_white' : 'admin_gray';
+                    }
+
+                    $tmp = $i ? 'White' : 'Blue';
+                    $style = '';
+                    if ($mycat['color'] == null) {
+                        $style .= 'color: black; border: solid 1px #000';
+                    } else {
+                        $style .= 'background: ' . $mycat['color'];
+                    }
+                    $i = $i ? 0 : 1;
+
+                    /* Number of tickets and graph width */
+                    $all = isset($tickets_all[$mycat['id']]) ? $tickets_all[$mycat['id']] : 0;
+                    $width_all = 0;
+                    if ($tickets_total && $all) {
+                        $width_all = round(($all / $tickets_total) * 100);
+                    }
+
+                    /* Deleting category with ID 1 (default category) is not allowed */
+                    if ($mycat['id'] == 1) {
+                        $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                    } else {
+                        $remove_code = ' <a href="manage_categories.php?a=remove&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
+                    }
+
+                    /* Is category private or public? */
+                    if ($mycat['type']) {
+                        $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_private'] . '"></span></a>';
+                    } else {
+                        $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user blue" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_public'] . '"></span></a>';
+                    }
+
+                    /* Is auto assign enabled? */
+                    if ($hesk_settings['autoassign']) {
+                        if ($mycat['autoassign']) {
+                            $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
                         } else {
-                            $color = $i ? 'admin_white' : 'admin_gray';
+                            $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
                         }
+                    } else {
+                        $autoassign_code = '';
+                    }
 
-                        $tmp = $i ? 'White' : 'Blue';
-                        $style = '';
-                        if ($mycat['color'] == null) {
-                            $style .= 'color: black; border: solid 1px #000';
-                        } else {
-                            $style .= 'background: ' . $mycat['color'];
-                        }
-                        $i = $i ? 0 : 1;
-
-                        /* Number of tickets and graph width */
-                        $all = isset($tickets_all[$mycat['id']]) ? $tickets_all[$mycat['id']] : 0;
-                        $width_all = 0;
-                        if ($tickets_total && $all) {
-                            $width_all = round(($all / $tickets_total) * 100);
-                        }
-
-                        /* Deleting category with ID 1 (default category) is not allowed */
-                        if ($mycat['id'] == 1) {
-                            $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                        } else {
-                            $remove_code = ' <a href="manage_categories.php?a=remove&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
-                        }
-
-                        /* Is category private or public? */
-                        if ($mycat['type']) {
-                            $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_private'] . '"></span></a>';
-                        } else {
-                            $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user blue" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_public'] . '"></span></a>';
-                        }
-
-                        /* Is auto assign enabled? */
-                        if ($hesk_settings['autoassign']) {
-                            if ($mycat['autoassign']) {
-                                $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
-                            } else {
-                                $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
-                            }
-                        } else {
-                            $autoassign_code = '';
-                        }
-
-                        echo '
+                    echo '
                 <tr data-category-id="' . $mycat['id'] . '" data-name="' . htmlspecialchars($mycat['name']) . '"
                     data-color="'. htmlspecialchars($mycat['color']) . '" data-priority="' . $mycat['priority'] . '"
                     data-manager="' . $mycat['manager'] . '" data-usage="'. $mycat['usage'] .'">
@@ -342,31 +354,30 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 ' . $autoassign_code . '
                 ' . $type_code . ' ';
 
-                        if ($orderBy != 'name' && $num > 1) {
-                            if ($j == 1) {
-                                echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;';
-                            } elseif ($j == $num) {
-                                echo '<a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                            } else {
-                                echo '
+                    if ($orderBy != 'name' && $num > 1) {
+                        if ($j == 1) {
+                            echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;';
+                        } elseif ($j == $num) {
+                            echo '<a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                        } else {
+                            echo '
                         <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a>
                         <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;
                         ';
-                            }
                         }
-                        echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
-                        echo $remove_code . '</td>
+                    }
+                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
+                    echo $remove_code . '</td>
                 </tr>
                 ';
 
-                    } // End while
+                } // End while
 
-                    ?>
-                </table>
-            </div>
+                ?>
+            </table>
         </div>
     </div>
-</div>
+</section>
 <!-- Edit category modal -->
 <div class="modal fade" id="edit-category-modal" tabindex="-1" role="dialog" style="overflow: hidden">
     <div class="modal-dialog modal-lg" role="document">
diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
index fb8eb43d..e282d05b 100644
--- a/admin/manage_email_templates.php
+++ b/admin/manage_email_templates.php
@@ -8,6 +8,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -60,192 +61,199 @@ if ($modsForHesk_settings['html_emails']) {
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-    <div class="row pad-20">
-        <ul class="nav nav-tabs" role="tablist">
-            <?php
-            // Show a link to banned_emails.php if user has permission
-            if (hesk_checkPermission('can_ban_emails', 0)) {
-                echo '
+<section class="content">
+    <div class="box">
+        <div class="box-body">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs" role="tablist">
+                    <?php
+                    // Show a link to banned_emails.php if user has permission
+                    if (hesk_checkPermission('can_ban_emails', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banemail'] . '" href="banned_emails.php">' . $hesklang['banemail'] . '</a>
             </li>
             ';
-            }
-            if (hesk_checkPermission('can_ban_ips', 0)) {
-                echo '
+                    }
+                    if (hesk_checkPermission('can_ban_ips', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banip'] . '" href="banned_ips.php">' . $hesklang['banip'] . '</a>
             </li>';
-            }
-            // Show a link to status_message.php if user has permission to do so
-            if (hesk_checkPermission('can_service_msg', 0)) {
-                echo '
+                    }
+                    // Show a link to status_message.php if user has permission to do so
+                    if (hesk_checkPermission('can_service_msg', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['sm_title'] . '" href="service_messages.php">' . $hesklang['sm_title'] . '</a>
             </li>';
-            }
-            ?>
-            <li role="presentation" class="active">
-                <a href="#"><?php echo $hesklang['email_templates']; ?> <i
-                        class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                        title="<?php echo $hesklang['email_templates']; ?>"
-                        data-content="<?php echo $hesklang['email_templates_intro']; ?>"></i></a>
-            </li>
-            <?php
-            if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-                echo '
+                    }
+                    ?>
+                    <li role="presentation" class="active">
+                        <a href="#"><?php echo $hesklang['email_templates']; ?> <i
+                                class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                title="<?php echo $hesklang['email_templates']; ?>"
+                                data-content="<?php echo $hesklang['email_templates_intro']; ?>"></i></a>
+                    </li>
+                    <?php
+                    if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['statuses'] . '" href="manage_statuses.php">' . $hesklang['statuses'] . '</a>
             </li>
             ';
-            }
-            ?>
-        </ul>
-        <div class="tab-content summaryList tabPadding">
-            <?php if ($showEditPanel): ?>
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4>
-                                    <?php
-                                    $isHtml = ($_GET['html'] == 'true');
-                                    $class = 'plaintext-editor';
-                                    if ($isHtml) {
-                                        $class = 'htmlEditor';
-                                        echo sprintf($hesklang['editing_html_template'], $_GET['template']);
-                                    } else {
-                                        echo sprintf($hesklang['editing_plain_text_template'], $_GET['template']);
-                                    } ?>
-                                </h4>
-                            </div>
-                            <div class="panel-body">
-                                <?php
-                                $fileContent = '';
-                                if ($isHtml) {
-                                    $fileContent = file_get_contents(HESK_PATH . 'language/' . urldecode($_GET['language']) . '/emails/html/' . $_GET['template']);
-                                } else {
-                                    $fileContent = file_get_contents(HESK_PATH . 'language/' . urldecode($_GET['language']) . '/emails/' . $_GET['template']);
-                                }
-                                if ($fileContent === false) {
-                                    //throw error
-                                }
-                                ?>
-                                <a href="#" id="showSpecialTags"
-                                   onclick="toggleContainers(['specialTags'],['showSpecialTags'])">
-                                    <?php echo $hesklang['show_special_tags']; ?>
-                                </a>
-
-                                <div id="specialTags" style="display: none">
-                                    <a href="#" onclick="toggleContainers(['showSpecialTags'],['specialTags'])">
-                                        <?php echo $hesklang['hide_special_tags']; ?>
-                                    </a>
-                                    <table class="table table-striped table-responsive table-condensed">
-                                        <thead>
-                                        <tr>
-                                            <th><?php echo $hesklang['special_tag']; ?></th>
-                                            <th><?php echo $hesklang['description'] ?></th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        <?php
-                                        $tags = getSpecialTagMap();
-                                        foreach ($tags as $tag => $text): ?>
-                                            <tr>
-                                                <td><?php echo $tag; ?></td>
-                                                <td><?php echo $text; ?></td>
-                                            </tr>
-                                        <?php endforeach; ?>
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <form action="manage_email_templates.php" method="post">
-                                    <textarea name="text" rows="15"
-                                              class="form-control <?php echo $class; ?>"><?php echo $fileContent; ?></textarea>
-                                    <input type="hidden" name="action" value="save">
-                                    <input type="hidden" name="template"
-                                           value="<?php echo htmlspecialchars($_GET['template']); ?>">
-                                    <input type="hidden" name="language"
-                                           value="<?php echo htmlspecialchars($_GET['language']); ?>">
-                                    <input type="hidden" name="html" value="<?php echo $isHtml; ?>">
-                                    <br>
-                                    <?php
-                                    $fileWritable = false;
-                                    if ($isHtml) {
-                                        $fileWritable = is_writable(HESK_PATH . 'language/' . $_GET['language'] . '/emails/html/' . $_GET['template']);
-                                    } else {
-                                        $fileWritable = is_writable(HESK_PATH . 'language/' . $_GET['language'] . '/emails/' . $_GET['template']);
-                                    }
-
-                                    if (!$fileWritable) {
-                                        echo '<div class="alert alert-danger">
-                                    <p>' . sprintf($hesklang['email_template_directory_not_writable'], $_GET['template']) . '</p>
-                                    </div>';
-                                    } else {
-                                        echo '<input type="submit" class="btn btn-default" value="' . $hesklang['save'] . '">';
-                                    }
-                                    ?>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            <?php endif; ?>
-            <div class="row">
-                <div class="col-md-12">
-                    <?php
-                    /* This will handle error, success and notice messages */
-                    hesk_handle_messages();
-
-                    // Output list of templates, and provide links to edit the plaintext and HTML versions for each language
-                    // First get list of languages
-                    $languages = array();
-                    foreach ($hesk_settings['languages'] as $key => $value) {
-                        $languages[$key] = $hesk_settings['languages'][$key]['folder'];
                     }
-
-                    // Get all files, but don't worry about index.htm, items beginning with '.', or the html folder
-                    // We'll also assume the template file exists in all language folders and in the html folder
-                    reset($languages);
-                    $firstKey = key($languages);
-                    $firstDirectory = HESK_PATH . 'language/' . $languages[$firstKey] . '/emails';
-                    $directoryListing = preg_grep('/^([^.])/', scandir($firstDirectory));
-                    $emailTemplates = array_diff($directoryListing, array('html', 'index.htm'));
-
                     ?>
-                    <table class="table table-striped table-responsive">
-                        <thead>
-                        <tr>
-                            <th><?php echo $hesklang['file_name']; ?></th>
-                            <?php foreach ($languages as $language => $languageCode): ?>
-                                <th><?php echo $language; ?></th>
-                            <?php endforeach; ?>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php foreach ($emailTemplates as $template): ?>
-                            <tr>
-                                <td><?php echo $template; ?></td>
-                                <?php foreach ($languages as $language => $languageCode): ?>
-                                    <td>
+                </ul>
+                <div class="tab-content summaryList tabPadding">
+                    <?php if ($showEditPanel): ?>
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h4>
+                                            <?php
+                                            $isHtml = ($_GET['html'] == 'true');
+                                            $class = 'plaintext-editor';
+                                            if ($isHtml) {
+                                                $class = 'htmlEditor';
+                                                echo sprintf($hesklang['editing_html_template'], $_GET['template']);
+                                            } else {
+                                                echo sprintf($hesklang['editing_plain_text_template'], $_GET['template']);
+                                            } ?>
+                                        </h4>
+                                    </div>
+                                    <div class="panel-body">
                                         <?php
-                                        echo getTemplateMarkup($template, $languageCode);
-                                        echo '&nbsp;&nbsp;&nbsp;';
-                                        if ($modsForHesk_settings['html_emails']) {
-                                            echo getTemplateMarkup($template, $languageCode, true);
+                                        $fileContent = '';
+                                        if ($isHtml) {
+                                            $fileContent = file_get_contents(HESK_PATH . 'language/' . urldecode($_GET['language']) . '/emails/html/' . $_GET['template']);
+                                        } else {
+                                            $fileContent = file_get_contents(HESK_PATH . 'language/' . urldecode($_GET['language']) . '/emails/' . $_GET['template']);
+                                        }
+                                        if ($fileContent === false) {
+                                            //throw error
                                         }
                                         ?>
-                                    </td>
+                                        <a href="#" id="showSpecialTags"
+                                           onclick="toggleContainers(['specialTags'],['showSpecialTags'])">
+                                            <?php echo $hesklang['show_special_tags']; ?>
+                                        </a>
+
+                                        <div id="specialTags" style="display: none">
+                                            <a href="#" onclick="toggleContainers(['showSpecialTags'],['specialTags'])">
+                                                <?php echo $hesklang['hide_special_tags']; ?>
+                                            </a>
+                                            <table class="table table-striped table-responsive table-condensed">
+                                                <thead>
+                                                <tr>
+                                                    <th><?php echo $hesklang['special_tag']; ?></th>
+                                                    <th><?php echo $hesklang['description'] ?></th>
+                                                </tr>
+                                                </thead>
+                                                <tbody>
+                                                <?php
+                                                $tags = getSpecialTagMap();
+                                                foreach ($tags as $tag => $text): ?>
+                                                    <tr>
+                                                        <td><?php echo $tag; ?></td>
+                                                        <td><?php echo $text; ?></td>
+                                                    </tr>
+                                                <?php endforeach; ?>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                        <form action="manage_email_templates.php" method="post">
+                                    <textarea name="text" rows="15"
+                                              class="form-control <?php echo $class; ?>"><?php echo $fileContent; ?></textarea>
+                                            <input type="hidden" name="action" value="save">
+                                            <input type="hidden" name="template"
+                                                   value="<?php echo htmlspecialchars($_GET['template']); ?>">
+                                            <input type="hidden" name="language"
+                                                   value="<?php echo htmlspecialchars($_GET['language']); ?>">
+                                            <input type="hidden" name="html" value="<?php echo $isHtml; ?>">
+                                            <br>
+                                            <?php
+                                            $fileWritable = false;
+                                            if ($isHtml) {
+                                                $fileWritable = is_writable(HESK_PATH . 'language/' . $_GET['language'] . '/emails/html/' . $_GET['template']);
+                                            } else {
+                                                $fileWritable = is_writable(HESK_PATH . 'language/' . $_GET['language'] . '/emails/' . $_GET['template']);
+                                            }
+
+                                            if (!$fileWritable) {
+                                                echo '<div class="alert alert-danger">
+                                    <p>' . sprintf($hesklang['email_template_directory_not_writable'], $_GET['template']) . '</p>
+                                    </div>';
+                                            } else {
+                                                echo '<input type="submit" class="btn btn-default" value="' . $hesklang['save'] . '">';
+                                            }
+                                            ?>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <?php
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
+
+                            // Output list of templates, and provide links to edit the plaintext and HTML versions for each language
+                            // First get list of languages
+                            $languages = array();
+                            foreach ($hesk_settings['languages'] as $key => $value) {
+                                $languages[$key] = $hesk_settings['languages'][$key]['folder'];
+                            }
+
+                            // Get all files, but don't worry about index.htm, items beginning with '.', or the html folder
+                            // We'll also assume the template file exists in all language folders and in the html folder
+                            reset($languages);
+                            $firstKey = key($languages);
+                            $firstDirectory = HESK_PATH . 'language/' . $languages[$firstKey] . '/emails';
+                            $directoryListing = preg_grep('/^([^.])/', scandir($firstDirectory));
+                            $emailTemplates = array_diff($directoryListing, array('html', 'index.htm'));
+
+                            ?>
+                            <table class="table table-striped table-responsive">
+                                <thead>
+                                <tr>
+                                    <th><?php echo $hesklang['file_name']; ?></th>
+                                    <?php foreach ($languages as $language => $languageCode): ?>
+                                        <th><?php echo $language; ?></th>
+                                    <?php endforeach; ?>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php foreach ($emailTemplates as $template): ?>
+                                    <tr>
+                                        <td><?php echo $template; ?></td>
+                                        <?php foreach ($languages as $language => $languageCode): ?>
+                                            <td>
+                                                <?php
+                                                echo getTemplateMarkup($template, $languageCode);
+                                                echo '&nbsp;&nbsp;&nbsp;';
+                                                if ($modsForHesk_settings['html_emails']) {
+                                                    echo getTemplateMarkup($template, $languageCode, true);
+                                                }
+                                                ?>
+                                            </td>
+                                        <?php endforeach; ?>
+                                    </tr>
                                 <?php endforeach; ?>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
+</section>
+
+
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 48a6b643..b1b5cb3a 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -38,6 +38,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/view_attachment_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 // Check for POST requests larger than what the server can handle
@@ -274,37 +275,50 @@ echo '';
 if (!isset($_SESSION['hide']['treemenu']))
 {
 	?>
-    <div class="row"><div class="col-md-10 col-md-offset-1">
-	<h3><?php echo $hesklang['kb']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['kb_intro']); ?>')"><i class="fa fa-question-circle settingsquestionmark font-size-20p"></i></a></h3>
-    <div class="footerWithBorder blankSpace"></div>
+    <section class="content">
+        <h2>
+            <?php echo $hesklang['kb']; ?>
+            <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['kb_intro']); ?>')">
+                <i class="fa fa-question-circle settingsquestionmark"></i>
+            </a>
+        </h2>
+        <?php
+        show_subnav();
 
-	<!-- SUB NAVIGATION -->
-   <?php show_subnav(); ?>
-	<!-- SUB NAVIGATION -->
-    <?php
-    // Show a notice if total public articles is less than 5
-    if ($total_articles < 5)
-    {
-        hesk_show_notice($hesklang['nkba']);
-    }
-    ?>
-
-	<!-- SHOW THE CATEGORY TREE -->
-	<?php show_treeMenu(); ?>
-	<!-- SHOW THE CATEGORY TREE -->
-
-    <h3><?php echo $hesklang['ktool']; ?></h3>
-    <div class="footerWithBorder blankSpace"></div>
-
-	<p>
-    <i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_private"><?php echo $hesklang['listp']; ?></a><br >
-    <i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_draft"><?php echo $hesklang['listd']; ?></a><br />
-    <i class="fa fa-gear font-size-16p gray"></i> <a href="manage_knowledgebase.php?a=update_count"><?php echo $hesklang['uac']; ?></a><br />
-    <i class="fa fa-globe font-size-16p"></i> <a href="http://support.mozilla.com/en-US/kb/how-to-write-knowledge-base-articles" rel="nofollow" target="_blank"><?php echo $hesklang['goodkb']; ?></a></p>
-
-	&nbsp;<br />
-
-        </div><div class="col-md-1">&nbsp;</div></div>
+        // Show a notice if total public articles is less than 5
+        if ($total_articles < 5)
+        {
+            hesk_show_notice($hesklang['nkba']);
+        }
+        ?>
+        <div class="row">
+            <div class="col-md-8">
+                <?php show_treeMenu(); ?>
+            </div>
+            <div class="col-md-4">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h1 class="box-title">
+                            <?php echo $hesklang['ktool']; ?>
+                        </h1>
+                        <div class="box-tools pull-right">
+                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                <i class="fa fa-minus"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="box-body">
+                        <ul class="list-unstyled">
+                            <li><i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_private"><?php echo $hesklang['listp']; ?></a></li>
+                            <li><i class="fa fa-search"></i> <a href="manage_knowledgebase.php?a=list_draft"><?php echo $hesklang['listd']; ?></a></li>
+                            <li><i class="fa fa-gear font-size-16p gray"></i> <a href="manage_knowledgebase.php?a=update_count"><?php echo $hesklang['uac']; ?></a></li>
+                            <li><i class="fa fa-globe font-size-16p"></i> <a href="http://support.mozilla.com/en-US/kb/how-to-write-knowledge-base-articles" rel="nofollow" target="_blank"><?php echo $hesklang['goodkb']; ?></a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
 	<?php
 } // END hide treemenu
 
@@ -330,10 +344,6 @@ if (!isset($_SESSION['hide']['new_article']))
         <li class="active"><?php echo $hesklang['new_kb_art']; ?></li>
     </ol>
 
-	<!-- SUB NAVIGATION -->
-	<?php $catid = show_subnav('newa'); ?>
-	<!-- SUB NAVIGATION -->
-
     <?php
     if ($hesk_settings['kb_wysiwyg'])
     {
@@ -359,138 +369,128 @@ if (!isset($_SESSION['hide']['new_article']))
         <?php
     }
     ?>
-    <h3 class="move-right-10"><a name="new_article"></a><?php echo $hesklang['new_kb_art']; ?></h3>
-    <div class="footerWithBorder blankSpace move-right-10 move-left-10"></div>
+    <section class="content">
+        <?php
+        $catid = show_subnav('newa');
+        $onsubmit = '';
+        if ($hesk_settings['kb_wysiwyg']) {
+            $onsubmit = 'onsubmit="return validateRichText(\'content-help-block\', \'content-group\', \'content\', \''.addslashes($hesklang['kb_e_cont']).'\')"';
+        }
+        ?>
+        <form action="manage_knowledgebase.php" role="form" method="post" name="form1" enctype="multipart/form-data" data-toggle="validator" <?php echo $onsubmit; ?>>
+            <div class="box">
+                <div class="box-header with-border">
+                    <h1 class="box-title">
+                        <a name="new_article"></a><?php echo $hesklang['new_kb_art']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <?php
+                    $displayType = $hesk_settings['kb_wysiwyg'] ? 'none' : 'block';
+                    $displayWarn = 'none';
+                    ?>
 
-    <?php
-    $onsubmit = '';
-    if ($hesk_settings['kb_wysiwyg']) {
-        $onsubmit = 'onsubmit="return validateRichText(\'content-help-block\', \'content-group\', \'content\', \''.addslashes($hesklang['kb_e_cont']).'\')"';
-    }
-    ?>
-    <form action="manage_knowledgebase.php" role="form" method="post" name="form1" enctype="multipart/form-data" data-toggle="validator" <?php echo $onsubmit; ?>>
-        <div class="row">
-            <div class="col-md-3">
-                <div class="panel panel-default move-right-10">
-                    <div class="panel-heading"><?php echo $hesklang['information']; ?></div>
-                    <div class="panel-body">
-                        <div class="form-group">
-                            <label for="catid" class="control-label"><?php echo $hesklang['kb_cat']; ?></label>
-                            <select name="catid" class="form-control"><?php $listBox->printMenu(); ?></select>
+                    <span id="contentType" style="display:<?php echo $displayType; ?>">
+                        <label><input type="radio" name="html" value="0" <?php if (!isset($_SESSION['new_article']['html']) || (isset($_SESSION['new_article']['html']) && $_SESSION['new_article']['html'] == 0) ) {echo 'checked="checked"';} ?> onclick="javascript:document.getElementById('kblinks').style.display = 'none'" /> <?php echo $hesklang['kb_dhtml']; ?></label><br />
+                        <label><input type="radio" name="html" value="1" <?php $display = 'none'; if (isset($_SESSION['new_article']['html']) && $_SESSION['new_article']['html'] == 1) {echo 'checked="checked"'; $displayWarn = 'block';} ?> onclick="javascript:document.getElementById('kblinks').style.display = 'block'" /> <?php echo $hesklang['kb_ehtml']; ?></label><br />
+                        <span id="kblinks" style="display:<?php echo $displayWarn; ?>"><i><?php echo $hesklang['kb_links']; ?></i></span>
+                    </span>
+                    <div class="form-group">
+                        <label for="subject" class="control-label"><?php echo $hesklang['kb_subject']; ?></label>
+                        <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kb_subject']); ?>" data-error="<?php echo htmlspecialchars($hesklang['kb_e_subj']); ?>"
+                               name="subject" size="70" maxlength="255" <?php if (isset($_SESSION['new_article']['subject'])) {echo 'value="'.$_SESSION['new_article']['subject'].'"';} ?> required>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                    <div class="form-group" id="content-group">
+                        <textarea class="form-control" id="content" name="content" rows="25" cols="70" data-error="<?php echo htmlspecialchars($hesklang['kb_e_cont']); ?>" id="content" required><?php if (isset($_SESSION['new_article']['content'])) {echo $_SESSION['new_article']['content'];} ?></textarea>
+                        <div class="help-block with-errors" id="content-help-block"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="box">
+                <div class="box-header with-border">
+                    <h1 class="box-title">
+                        <?php echo $hesklang['information']; ?>
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label for="catid" class="control-label"><?php echo $hesklang['kb_cat']; ?></label>
+                                <select name="catid" class="form-control"><?php $listBox->printMenu(); ?></select>
+                            </div>
+                            <div class="form-group">
+                                <label for="type" class="control-label"><?php echo $hesklang['kb_type']; ?></label>
+                                <?php
+                                if (isset($_SESSION['new_article']['type']))
+                                {
+                                    $selectedIndex = -1;
+                                } else
+                                {
+                                    $modsForHesk_settings = mfh_getSettings();
+                                    $selectedIndex = $modsForHesk_settings['new_kb_article_visibility'];
+                                }
+                                ?>
+                                <div class="radio">
+                                    <label><input type="radio" name="type" value="0" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 0) || $selectedIndex == 0)  {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_published']; ?> &nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_published2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                </div>
+                                <div class="radio">
+                                    <label><input type="radio" name="type" value="1" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 1) || $selectedIndex == 1) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_private']; ?>&nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_private2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                </div>
+                                <div class="radio">
+                                    <label><input type="radio" name="type" value="2" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 2) || $selectedIndex == 2) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_draft']; ?>&nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_draft2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="sticky" class="control-label"><?php echo $hesklang['opt']; ?></label>
+                                <div class="checkbox">
+                                    <label><input type="checkbox" name="sticky" value="Y" <?php if ( ! empty($_SESSION['new_article']['sticky'])) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['sticky']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['saa']); ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                                </div>
+                            </div>
                         </div>
-                        <div class="form-group">
-                            <label for="type" class="control-label"><?php echo $hesklang['kb_type']; ?></label>
-                            <?php
-                            if (isset($_SESSION['new_article']['type']))
-                            {
-                                $selectedIndex = -1;
-                            } else
-                            {
-                                $modsForHesk_settings = mfh_getSettings();
-                                $selectedIndex = $modsForHesk_settings['new_kb_article_visibility'];
-                            }
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label for="keywords" class="control-label"><?php echo $hesklang['kw']; ?></label>
+                                <p class="font-size-90 form-control-static"><?php echo $hesklang['kw1']; ?></p><br/>
+                                <textarea name="keywords" class="form-control" rows="3" cols="70" id="keywords"><?php if (isset($_SESSION['new_article']['keywords'])) {echo $_SESSION['new_article']['keywords'];} ?></textarea>
+                            </div>
+                            <?php if ($hesk_settings['attachments']['use']): ?>
+                                <div class="form-group">
+                                    <label for="attachments" class="control-label"><?php echo $hesklang['attachments']; ?> (<a href="Javascript:void(0)" onclick="Javascript:hesk_window('../file_limits.php',250,500);return false;"><?php echo $hesklang['ful']; ?></a>)</label>
+                                    <?php build_dropzone_markup(true); ?>
+                                </div>
+                                <?php
+                                display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/admin/knowledgebase/upload-attachment.php');
+                            endif; // End attachments
                             ?>
-                            <div class="radio">
-                                <label><input type="radio" name="type" value="0" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 0) || $selectedIndex == 0)  {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_published']; ?> &nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_published2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                            </div>
-                            <div class="radio">
-                                <label><input type="radio" name="type" value="1" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 1) || $selectedIndex == 1) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_private']; ?>&nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_private2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                            </div>
-                            <div class="radio">
-                                <label><input type="radio" name="type" value="2" <?php if ((isset($_SESSION['new_article']['type']) && $_SESSION['new_article']['type'] == 2) || $selectedIndex == 2) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['kb_draft']; ?>&nbsp;<a href="javascript:void(0)" onclick="javascript:alert('<?php echo $hesklang['kb_draft2']; ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                            </div>
                         </div>
-                        <div class="form-group">
-                            <label for="sticky" class="control-label"><?php echo $hesklang['opt']; ?></label>
-                            <div class="checkbox">
-                                <label><input type="checkbox" name="sticky" value="Y" <?php if ( ! empty($_SESSION['new_article']['sticky'])) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['sticky']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['saa']); ?>')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
-                            </div>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <div class="form-group">
+                        <input type="hidden" name="a" value="new_article" />
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
+
+                        <div class="btn-group">
+                            <input type="submit" value="<?php echo $hesklang['kb_save']; ?>" class="btn btn-primary" />
+                            <a class="btn btn-default" href="manage_knowledgebase.php?a=manage_cat&amp;catid=<?php echo $catid; ?>"><?php echo $hesklang['cancel']; ?></a>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
-                <?php
-                $displayType = $hesk_settings['kb_wysiwyg'] ? 'none' : 'block';
-                $displayWarn = 'none';
-                ?>
-
-                <span id="contentType" style="display:<?php echo $displayType; ?>">
-                    <label><input type="radio" name="html" value="0" <?php if (!isset($_SESSION['new_article']['html']) || (isset($_SESSION['new_article']['html']) && $_SESSION['new_article']['html'] == 0) ) {echo 'checked="checked"';} ?> onclick="javascript:document.getElementById('kblinks').style.display = 'none'" /> <?php echo $hesklang['kb_dhtml']; ?></label><br />
-                    <label><input type="radio" name="html" value="1" <?php $display = 'none'; if (isset($_SESSION['new_article']['html']) && $_SESSION['new_article']['html'] == 1) {echo 'checked="checked"'; $displayWarn = 'block';} ?> onclick="javascript:document.getElementById('kblinks').style.display = 'block'" /> <?php echo $hesklang['kb_ehtml']; ?></label><br />
-                    <span id="kblinks" style="display:<?php echo $displayWarn; ?>"><i><?php echo $hesklang['kb_links']; ?></i></span>
-                </span>
-                <div class="form-group">
-                    <label for="subject" class="control-label"><?php echo $hesklang['kb_subject']; ?></label>
-                    <input type="text" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['kb_subject']); ?>" data-error="<?php echo htmlspecialchars($hesklang['kb_e_subj']); ?>"
-                        name="subject" size="70" maxlength="255" <?php if (isset($_SESSION['new_article']['subject'])) {echo 'value="'.$_SESSION['new_article']['subject'].'"';} ?> required>
-                    <div class="help-block with-errors"></div>
-                </div>
-                <div class="form-group" id="content-group">
-                    <textarea class="form-control" id="content" name="content" rows="25" cols="70" data-error="<?php echo htmlspecialchars($hesklang['kb_e_cont']); ?>" id="content" required><?php if (isset($_SESSION['new_article']['content'])) {echo $_SESSION['new_article']['content'];} ?></textarea>
-                    <div class="help-block with-errors" id="content-help-block"></div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="panel panel-default move-left-10">
-                    <div class="panel-body">
-                        <div class="form-group">
-                            <label for="keywords" class="control-label"><?php echo $hesklang['kw']; ?></label>
-                            <p class="font-size-90 form-control-static"><?php echo $hesklang['kw1']; ?></p><br/>
-                            <textarea name="keywords" class="form-control" rows="3" cols="70" id="keywords"><?php if (isset($_SESSION['new_article']['keywords'])) {echo $_SESSION['new_article']['keywords'];} ?></textarea>
-                        </div>
-                        <?php if ($hesk_settings['attachments']['use']): ?>
-                        <div class="form-group">
-                            <label for="attachments" class="control-label"><?php echo $hesklang['attachments']; ?> (<a href="Javascript:void(0)" onclick="Javascript:hesk_window('../file_limits.php',250,500);return false;"><?php echo $hesklang['ful']; ?></a>)</label>
-                            <?php build_dropzone_markup(true); ?>
-                        </div>
-                        <?php 
-							display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/admin/knowledgebase/upload-attachment.php'); 
-							endif; // End attachments
-						?>
-                        <br>
-                        <div class="form-group">
-                            <input type="hidden" name="a" value="new_article" />
-                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
-
-                            <div class="btn-group">
-                                <input type="submit" value="<?php echo $hesklang['kb_save']; ?>" class="btn btn-primary" />
-                                <a class="btn btn-default" href="manage_knowledgebase.php?a=manage_cat&amp;catid=<?php echo $catid; ?>"><?php echo $hesklang['cancel']; ?></a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-
-	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-		<td>
-
-		    <div align="center">
-		    <table border="0">
-		    <tr>
-		    <td>
-
-
-
-		    <form action="manage_knowledgebase.php" method="post" name="form1" enctype="multipart/form-data">
-
-			<p>&nbsp;<br /><br />
-	        <br />&nbsp;
-			</p>
-
-			<p align="center"></p>
-			</form>
-
-			</td>
-			</tr>
-			</table>
-		    </div>
-		</td>
-		</tr>
-	</table>
+        </form>
+    </section>
 
 	<?php
 } // END hide article
@@ -509,68 +509,76 @@ if (!isset($_SESSION['hide']['new_category']))
         <li><a href="manage_knowledgebase.php"><?php echo $hesklang['kb']; ?></a></li>
         <li class="active"><?php echo $hesklang['kb_cat_new']; ?></li>
     </ol>
-
-	<!-- SUB NAVIGATION -->
-	<?php show_subnav('newc'); ?>
-	<!-- SUB NAVIGATION -->
-
-    <div class="row">
-        <div class="col-md-4 move-right-40">
-		    <?php
+    <section class="content">
+        <?php show_subnav('newc'); ?>
+        <div class="row">
+            <div class="col-md-5">
+                <?php
                 /* Show the treemenu? */
                 if (isset($_SESSION['hide']['cat_treemenu']))
                 {
                     show_treeMenu();
                 }
-            ?>
-	    </div>
-        <div class="col-md-7 move-left-20">
-            <form action="manage_knowledgebase.php" class="form-horizontal" method="post" role="form" name="form2" data-toggle="validator">
-                <h3><a name="new_category"></a><?php echo $hesklang['kb_cat_new']; ?></h3>
-                <div class="footerWithBorder blankSpace"></div>
-
-                <div class="form-group">
-                    <label for="title" class="col-sm-3 control-label"><?php echo $hesklang['kb_cat_title']; ?></label>
-                    <div class="col-sm-9">
-                        <input type="text" class="form-control" name="title" size="70" maxlength="255" data-error="<?php echo htmlspecialchars($hesklang['kb_cat_e_title']); ?>" required>
-                        <div class="help-block with-errors"></div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="parent" class="col-sm-3 control-label"><?php echo $hesklang['kb_cat_parent']; ?>:</label>
-                    <div class="col-sm-9">
-                        <select class="form-control" name="parent"><?php $listBox->printMenu()?></select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="type" class="col-sm-3 control-label"><?php echo $hesklang['kb_type']; ?>:</label>
-                    <div class="col-sm-9">
-                        <div class="radio">
-                            <label><input type="radio" name="type" value="0" <?php if (!isset($_SESSION['new_category']['type']) || (isset($_SESSION['new_category']['type']) && $_SESSION['new_category']['type'] == 0) ) {echo 'checked="checked"';} ?> /> <b><i><?php echo $hesklang['kb_published']; ?></i></b></label>
-                            <p class="form-static-content"><?php echo $hesklang['kb_cat_published']; ?></p>
+                ?>
+            </div>
+            <div class="col-md-7">
+                <form action="manage_knowledgebase.php" class="form-horizontal" method="post" role="form" name="form2" data-toggle="validator">
+                    <div class="box">
+                        <div class="box-header with-border">
+                            <h1 class="box-title">
+                                <a name="new_category"></a><?php echo $hesklang['kb_cat_new']; ?>
+                            </h1>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                    <i class="fa fa-minus"></i>
+                                </button>
+                            </div>
                         </div>
-                        <div class="radio">
-                            <label><input type="radio" name="type" value="1" <?php if (isset($_SESSION['new_category']['type']) && $_SESSION['new_category']['type'] == 1) {echo 'checked="checked"';} ?> /> <b><i><?php echo $hesklang['kb_private']; ?></i></b></label>
-                            <p class="form-static-content"><?php echo $hesklang['kb_cat_private']; ?></p>
+                        <div class="box-body">
+                            <div class="form-group">
+                                <label for="title" class="col-sm-3 control-label"><?php echo $hesklang['kb_cat_title']; ?></label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="title" size="70" maxlength="255" data-error="<?php echo htmlspecialchars($hesklang['kb_cat_e_title']); ?>" required>
+                                    <div class="help-block with-errors"></div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="parent" class="col-sm-3 control-label"><?php echo $hesklang['kb_cat_parent']; ?>:</label>
+                                <div class="col-sm-9">
+                                    <select class="form-control" name="parent"><?php $listBox->printMenu()?></select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="type" class="col-sm-3 control-label"><?php echo $hesklang['kb_type']; ?>:</label>
+                                <div class="col-sm-9">
+                                    <div class="radio">
+                                        <label><input type="radio" name="type" value="0" <?php if (!isset($_SESSION['new_category']['type']) || (isset($_SESSION['new_category']['type']) && $_SESSION['new_category']['type'] == 0) ) {echo 'checked="checked"';} ?> /> <b><i><?php echo $hesklang['kb_published']; ?></i></b></label>
+                                        <p class="form-static-content"><?php echo $hesklang['kb_cat_published']; ?></p>
+                                    </div>
+                                    <div class="radio">
+                                        <label><input type="radio" name="type" value="1" <?php if (isset($_SESSION['new_category']['type']) && $_SESSION['new_category']['type'] == 1) {echo 'checked="checked"';} ?> /> <b><i><?php echo $hesklang['kb_private']; ?></i></b></label>
+                                        <p class="form-static-content"><?php echo $hesklang['kb_cat_private']; ?></p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-sm-9 col-sm-offset-3">
+                                    <input type="hidden" name="a" value="new_category" />
+                                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
+                                    <div class="btn-group">
+                                        <input type="submit" value="<?php echo $hesklang['kb_cat_add']; ?>" class="btn btn-primary" />
+                                        <a class="btn btn-default" href="manage_knowledgebase.php"><?php echo $hesklang['cancel']; ?></a>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="form-group">
-                    <div class="col-sm-9 col-sm-offset-3">
-                        <input type="hidden" name="a" value="new_category" />
-                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
-                        <div class="btn-group">
-                            <input type="submit" value="<?php echo $hesklang['kb_cat_add']; ?>" class="btn btn-primary" />
-                            <a class="btn btn-default" href="manage_knowledgebase.php"><?php echo $hesklang['cancel']; ?></a>
-                        </div>
-                    </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
-    </div>
+    </section>
 
 	<?php
-
 } // END hide new category form
 
 /* Clean unneeded session variables */
@@ -598,93 +606,92 @@ function list_draft() {
 	/* Print main manage users page */
 	require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	?>
-
-	</td>
-	</tr>
-	<tr>
-	<td>
-
     <ol class="breadcrumb">
         <li><a href="manage_knowledgebase.php"><?php echo $hesklang['kb']; ?></a></li>
         <li class="active"><?php echo $hesklang['kb_cat_man']; ?></li>
     </ol>
+    <section class="content">
+        <?php
+        show_subnav('',$catid);
+        $res = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type`='2' ORDER BY `catid` ASC, `id` ASC");
+        $num = hesk_dbNumRows($res);
+        ?>
+        <div class="box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['artd']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-minus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <?php
+                if ($num == 0)
+                {
+                    echo $hesklang['kb_no_dart'];
+                }
+                else
+                {
+                    ?>
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th>&nbsp;</th>
+                            <th><?php echo $hesklang['kb_subject']; ?></th>
+                            <th><?php echo $hesklang['kb_cat']; ?></th>
+                            <th><?php echo $hesklang['opt']; ?></th>
+                        </tr>
+                        </thead>
+                        <?php
 
-	<!-- SUB NAVIGATION -->
-	<?php show_subnav('',$catid); ?>
-	<!-- SUB NAVIGATION -->
+                        $j=1;
+
+                        while ($article = hesk_dbFetchAssoc($res))
+                        {
+
+                            if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
+                            {
+                                unset($_SESSION['artord']);
+                            }
+
+                            // Check for articles with no existing parent category
+                            if ( ! isset($kb_cat[$article['catid']]) )
+                            {
+                                $article['catid'] = hesk_stray_article($article['id']);
+                            }
+
+                            ?>
+                            <tr>
+                                <td><?php echo $j; ?>.</td>
+                                <td><?php echo $article['subject']; ?></td>
+                                <td><?php echo $kb_cat[$article['catid']]; ?></td>
+                                <td style="white-space:nowrap;">
+                                    <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o" data-toggle="tooltip" title="<?php echo $hesklang['viewart']; ?>"></i></a>
+                                    <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i></a>
+                                    <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times icon-link red" data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i></a></td>
+                            </tr>
+                            <?php
+                            $j++;
+                        } // End while
+                        ?>
+                    </table>
+                    <?php
+                }
+            ?>
+            </div>
+            <div class="box-footer">
+                <a class="btn btn-success" href="manage_knowledgebase.php?a=add_article&amp;catid=<?php echo $catid; ?>&amp;type=2">
+                    <i class="fa fa-plus"></i>
+                    <?php echo $hesklang['kb_i_art2']; ?>
+                </a>
+            </div>
+        </div>
+    </section>
 
     <?php
-    $res = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type`='2' ORDER BY `catid` ASC, `id` ASC");
-    $num = hesk_dbNumRows($res);
-
-    if ($num == 0)
-    {
-    	echo '<p class="move-right-40">'.$hesklang['kb_no_dart'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
-    }
-    else
-    {
-    	?>
-        <div class="nu-floatRight">
-	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><i class="fa fa-plus font-size-16p green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=2"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
-	    </div>
-
-	    <h3 class="pad-up-5">&raquo; <?php echo $hesklang['artd']; ?></h3>
-
-		<div align="center">
-		<table border="0" width="100%" cellspacing="1" cellpadding="3" class="white">
-		<tr>
-        <th class="admin_white">&nbsp;</th>
-		<th class="admin_white"><b><i><?php echo $hesklang['kb_subject']; ?></i></b></th>
-		<th class="admin_white"><b><i><?php echo $hesklang['kb_cat']; ?></i></b></th>
-        <th class="admin_white" style="width:120px"><b><i>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</i></b></th>
-		</tr>
-    	<?php
-
-		$i=1;
-        $j=1;
-
-		while ($article = hesk_dbFetchAssoc($res))
-		{
-
-			if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
-			{
-				$color = 'admin_green';
-				unset($_SESSION['artord']);
-			}
-			else
-			{
-				$color = $i ? 'admin_white' : 'admin_gray';
-			}
-
-            // Check for articles with no existing parent category
-            if ( ! isset($kb_cat[$article['catid']]) )
-            {
-                $article['catid'] = hesk_stray_article($article['id']);
-            }
-
-			$tmp   = $i ? 'White' : 'Blue';
-			$style = 'class="option'.$tmp.'OFF" onmouseover="this.className=\'option'.$tmp.'ON\'" onmouseout="this.className=\'option'.$tmp.'OFF\'"';
-			$i     = $i ? 0 : 1;
-
-        	$type = $hesklang['kb_draft'];
-        	?>
-			<tr>
-			<td class="<?php echo $color; ?>"><?php echo $j; ?>.</td>
-			<td class="<?php echo $color; ?>"><?php echo $article['subject']; ?></td>
-            <td class="<?php echo $color; ?>"><?php echo $kb_cat[$article['catid']]; ?></td>
-            <td class="<?php echo $color; ?> text-center" style="white-space:nowrap;">
-            <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><img src="../img/article_text.png" width="16" height="16" alt="<?php echo $hesklang['viewart']; ?>" title="<?php echo $hesklang['viewart']; ?>" <?php echo $style; ?> /></a>
-            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange"></i></a>
-            <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><img src="../img/delete.png" width="16" height="16" alt="<?php echo $hesklang['delete']; ?>" title="<?php echo $hesklang['delete']; ?>" <?php echo $style; ?> /></a>&nbsp;</td>
-			</tr>
-            <?php
-			$j++;
-		} // End while
-		?>
-		</table>
-		</div>
-		<?php
-    }
 
     echo '&nbsp;<br />&nbsp;';
 
@@ -722,116 +729,119 @@ function list_private() {
 
 	/* Print main manage users page */
 	require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
-	?>
 
-	</td>
-	</tr>
-	<tr>
-	<td>
+    $res = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type`='1' " . (count($private_categories) ? " OR `catid` IN('" . implode("','", $private_categories) . "') " : '') . " ORDER BY `catid` ASC, `id` ASC");
+    $num = hesk_dbNumRows($res);
+	?>
 
     <ol class="breadcrumb">
         <li><a href="manage_knowledgebase.php"><?php echo $hesklang['kb']; ?></a></li>
         <li class="active"><?php echo $hesklang['kb_cat_man']; ?></li>
     </ol>
+    <section class="content">
+        <?php show_subnav('',$catid); ?>
+        <div class="box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['artp']; ?>
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-minus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <?php
+                if ($num == 0)
+                {
+                    echo '<p>'.$hesklang['kb_no_part'].'</p>';
+                }
+                else
+                {
+                    ?>
+                        <table class="table table-striped">
+                            <thead>
+                            <tr>
+                                <th>&nbsp;</th>
+                                <th><?php echo $hesklang['kb_subject']; ?></th>
+                                <th><?php echo $hesklang['kb_cat']; ?></th>
+                                <th><?php echo $hesklang['views']; ?></th>
+                                <?php
+                                if ($hesk_settings['kb_rating'])
+                                {
+                                    ?>
+                                    <th style="white-space:nowrap" nowrap="nowrap" width="130"><?php echo $hesklang['rating'].' ('.$hesklang['votes'].')'; ?></th>
+                                    <?php
+                                }
+                                ?>
+                                <th style="width:120px"><?php echo $hesklang['opt']; ?></th>
+                            </tr>
+                            </thead>
+                            <?php
 
-	<!-- SUB NAVIGATION -->
-	<?php show_subnav('',$catid); ?>
-	<!-- SUB NAVIGATION -->
+                            $i=1;
+                            $j=1;
+
+                            while ($article = hesk_dbFetchAssoc($res))
+                            {
+
+                                if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
+                                {
+                                    unset($_SESSION['artord']);
+                                }
+
+                                // Check for articles with no existing parent category
+                                if ( ! isset($kb_cat[$article['catid']]) )
+                                {
+                                    $article['catid'] = hesk_stray_article($article['id']);
+                                }
+
+                                $tmp   = $i ? 'White' : 'Blue';
+                                $i     = $i ? 0 : 1;
+
+
+                                if ($hesk_settings['kb_rating'])
+                                {
+                                    $alt = $article['rating'] ? sprintf($hesklang['kb_rated'], sprintf("%01.1f", $article['rating'])) : $hesklang['kb_not_rated'];
+                                    $rat = '<td><span data-toggle="tooltip" title="' . $alt . '">' . mfh_get_stars(hesk_round_to_half($article['rating'])) . '</span> (' . $article['votes'] . ')</td>';
+                                }
+                                else
+                                {
+                                    $rat = '';
+                                }
+
+                                ?>
+                                <tr>
+                                    <td><?php echo $j; ?>.</td>
+                                    <td><?php echo $article['subject']; ?></td>
+                                    <td><?php echo $kb_cat[$article['catid']]; ?></td>
+                                    <td><?php echo $article['views']; ?></td>
+                                    <?php echo $rat; ?>
+                                    <td class="text-center">
+                                        <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o icon-link" data-toggle="tooltip" title="<?php echo $hesklang['viewart']; ?>"></i></a>
+                                        <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i></a>
+                                        <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times red icon-link" data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i></a>&nbsp;</td>
+                                </tr>
+                                <?php
+                                $j++;
+                            } // End while
+                            ?>
+                        </table>
+                    <?php
+                }
+                ?>
+            </div>
+            <div class="box-footer">
+                <a class="btn btn-success" href="manage_knowledgebase.php?a=add_article&amp;catid=<?php echo $catid; ?>&amp;type=1">
+                    <i class="fa fa-plus"></i>
+                    <?php echo $hesklang['kb_i_art2']; ?>
+                </a>
+            </div>
+        </div>
+    </section>
 
     <?php
-	$res = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type`='1' " . (count($private_categories) ? " OR `catid` IN('" . implode("','", $private_categories) . "') " : '') . " ORDER BY `catid` ASC, `id` ASC");
-    $num = hesk_dbNumRows($res);
-
-    if ($num == 0)
-    {
-    	echo '<p class="move-right-40">'.$hesklang['kb_no_part'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
-    }
-    else
-    {
-    	?>
-        <div class="nu-floatRight">
-	        <?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><i class="fa fa-plus icon-link green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'&amp;type=1"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?>
-	    </div>
-
-	    <h3 style="padding-bottom:5px;">&raquo; <?php echo $hesklang['artp']; ?></h3>
-
-		<div align="center">
-		<table border="0" width="100%" cellspacing="1" cellpadding="3" class="white">
-		<tr>
-        <th class="admin_white">&nbsp;</th>
-		<th class="admin_white"><b><i><?php echo $hesklang['kb_subject']; ?></i></b></th>
-		<th class="admin_white"><b><i><?php echo $hesklang['kb_cat']; ?></i></b></th>
-        <th class="admin_white"><b><i><?php echo $hesklang['views']; ?></i></b></th>
-        <?php
-        if ($hesk_settings['kb_rating'])
-        {
-	        ?>
-	        <th class="admin_white" style="white-space:nowrap" nowrap="nowrap" width="130"><b><i><?php echo $hesklang['rating'].' ('.$hesklang['votes'].')'; ?></i></b></th>
-	        <?php
-        }
-        ?>
-        <th class="admin_white" style="width:120px"><b><i>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</i></b></th>
-		</tr>
-    	<?php
-
-		$i=1;
-        $j=1;
-
-		while ($article = hesk_dbFetchAssoc($res))
-		{
-
-			if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
-			{
-				$color = 'admin_green';
-				unset($_SESSION['artord']);
-			}
-			else
-			{
-				$color = $i ? 'admin_white' : 'admin_gray';
-			}
-
-            // Check for articles with no existing parent category
-            if ( ! isset($kb_cat[$article['catid']]) )
-            {
-                $article['catid'] = hesk_stray_article($article['id']);
-            }
-
-			$tmp   = $i ? 'White' : 'Blue';
-			$style = 'class="option'.$tmp.'OFF" onmouseover="this.className=\'option'.$tmp.'ON\'" onmouseout="this.className=\'option'.$tmp.'OFF\'"';
-			$i     = $i ? 0 : 1;
-
-        	$type = $hesklang['kb_private'];
-
-            if ($hesk_settings['kb_rating'])
-            {
-	            $alt = $article['rating'] ? sprintf($hesklang['kb_rated'], sprintf("%01.1f", $article['rating'])) : $hesklang['kb_not_rated'];
-	            $rat = '<td class="'.$color.'" style="white-space:nowrap;"><img src="../img/star_'.(hesk_round_to_half($article['rating'])*10).'.png" width="85" height="16" alt="'.$alt.'" title="'.$alt.'" border="0" style="vertical-align:text-bottom" /> ('.$article['votes'].') </td>';
-            }
-            else
-            {
-            	$rat = '';
-            }
-
-        	?>
-			<tr>
-			<td class="<?php echo $color; ?>"><?php echo $j; ?>.</td>
-			<td class="<?php echo $color; ?>"><?php echo $article['subject']; ?></td>
-            <td class="<?php echo $color; ?>"><?php echo $kb_cat[$article['catid']]; ?></td>
-            <td class="<?php echo $color; ?>"><?php echo $article['views']; ?></td>
-            <?php echo $rat; ?>
-            <td class="<?php echo $color; ?> text-center">
-            <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><img src="../img/article_text.png" width="16" height="16" alt="<?php echo $hesklang['viewart']; ?>" title="<?php echo $hesklang['viewart']; ?>" <?php echo $style; ?> /></a>
-            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil icon-link orange"></i></a>
-            <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><img src="../img/delete.png" width="16" height="16" alt="<?php echo $hesklang['delete']; ?>" title="<?php echo $hesklang['delete']; ?>" <?php echo $style; ?> /></a>&nbsp;</td>
-			</tr>
-            <?php
-			$j++;
-		} // End while
-		?>
-		</table>
-		</div>
-		<?php
-    }
 
     echo '&nbsp;<br />&nbsp;';
 
@@ -1635,47 +1645,40 @@ function manage_category() {
 	require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 	?>
 
-	</td>
-	</tr>
-
     <ol class="breadcrumb">
         <li><a href="manage_knowledgebase.php"><?php echo $hesklang['kb']; ?></a></li>
         <li class="active"><?php echo $hesklang['kb_cat_man']; ?></li>
     </ol>
+    <section class="content">
+        <?php
+        show_subnav('',$catid);
+        $result = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='{$catid}' ORDER BY `sticky` DESC, `art_order` ASC");
+        $num    = hesk_dbNumRows($result);
+        $secondCol = $catid == 1 ? 'col-md-12' : 'col-md-8';
 
-	<!-- SUB NAVIGATION -->
-	<?php show_subnav('',$catid); ?>
-	<!-- SUB NAVIGATION -->
-
-	<?php
-    if ( ! isset($_SESSION['hide']['article_list']))
-    {
-    ?>
-
-    <h3 class="move-right-40"><?php echo $hesklang['category']; ?>: <span class="black"><?php echo $this_cat['name']; ?></span></h3>
-
-
-    &nbsp;<br />
-
-    <?php
-	$result = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='{$catid}' ORDER BY `sticky` DESC, `art_order` ASC");
-    $num    = hesk_dbNumRows($result);
-    $secondCol = $catid == 1 ? 'col-md-12' : 'col-md-8';
-    $secondStyle = $catid == 1 ? 'margin-left: 25px' : 'padding-right: 40px';
-    ?>
-    <div class="row">
-        <?php if ($catid != 1): ?>
-        <div class="col-md-4">
-            <div class="move-right-25">
-                <div class="panel panel-default">
-                    <div class="panel-heading"><?php echo $hesklang['catset']; ?></div>
-                    <div class="panel-body">
+        if ( ! isset($_SESSION['hide']['article_list'])):
+        ?>
+        <div class="row">
+            <?php if ($catid != 1): ?>
+            <div class="col-md-4">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h1 class="box-title">
+                            <?php echo $hesklang['catset']; ?>
+                        </h1>
+                        <div class="box-tools pull-right">
+                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                <i class="fa fa-minus"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="box-body">
                         <form action="manage_knowledgebase.php" method="post" role="form" name="form1" data-toggle="validator"
-                            onsubmit="Javascript:return hesk_deleteIfSelected('dodelete','<?php echo hesk_makeJsString($hesklang['kb_delcat']); ?>')">
+                              onsubmit="Javascript:return hesk_deleteIfSelected('dodelete','<?php echo hesk_makeJsString($hesklang['kb_delcat']); ?>')">
                             <div class="form-group">
                                 <label for="title" class="control-label"><?php echo $hesklang['kb_cat_title']; ?></label>
                                 <input type="text" class="form-control" name="title" size="70" maxlength="255" value="<?php echo $this_cat['name']; ?>"
-                                data-error="<?php echo htmlspecialchars($hesklang['kb_cat_e_title']); ?>" required>
+                                       data-error="<?php echo htmlspecialchars($hesklang['kb_cat_e_title']); ?>" required>
                                 <div class="help-block with-errors"></div>
                             </div>
                             <div class="form-group">
@@ -1722,161 +1725,166 @@ function manage_category() {
                     </div>
                 </div>
             </div>
-        </div>
-        <?php endif; ?>
-        <div class="<?php echo $secondCol; ?>" style="<?php echo $secondStyle; ?>">
-    <?php
-    if ($num == 0)
-    {
-    	echo '<p>'.$hesklang['kb_no_art'].' &nbsp; <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus icon-link green"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a></p>';
-    }
-    else
-    {
-	    /* Get number of sticky articles */
-		$res2 = hesk_dbQuery("SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='{$catid}' AND `sticky` = '1' ");
-	    $num_sticky = hesk_dbResult($res2);
-
-		$num_nosticky = $num - $num_sticky;
-
-    	?>
-                <h3><?php echo $hesklang['kb_cat_art']; ?> <small class="nu-floatRight"><?php echo '<a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><i class="fa fa-plus"></i></a> <a href="manage_knowledgebase.php?a=add_article&amp;catid='.$catid.'"><b>'.$hesklang['kb_i_art2'].'</b></a>'; ?></small></h3>
-                <div class="footerWithBorder blankSpace"></div>
-
-                <table class="table table-striped">
-                <tr>
-                <th>&nbsp;</th>
-                <th><?php echo $hesklang['kb_subject']; ?></th>
-                <th><?php echo $hesklang['kb_type']; ?></th>
-                <th><?php echo $hesklang['views']; ?></th>
-                <?php
-                if ($hesk_settings['kb_rating'])
-                {
-                    ?>
-                    <th><?php echo $hesklang['rating'].' ('.$hesklang['votes'].')'; ?></th>
-                    <?php
-                }
-                ?>
-                <th>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</th>
-                </tr>
-                <?php
-
-                $i=1;
-                $j=1;
-                $k=1;
-                $previous_sticky=1;
-                $num = $num_sticky;
-
-                while ($article=hesk_dbFetchAssoc($result))
-                {
-
-                    if ($previous_sticky != $article['sticky'])
-                    {
-                        $k = 1;
-                        $num = $num_nosticky;
-                        $previous_sticky = $article['sticky'];
-                    }
-
-                    if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
-                    {
-                        $color = 'admin_green';
-                        unset($_SESSION['artord']);
-                    }
-                    elseif ($article['sticky'])
-                    {
-                        $color = 'admin_yellow';
-                    }
-                    else
-                    {
-                        $color = $i ? 'admin_white' : 'admin_gray';
-                    }
-
-                    $tmp   = $i ? 'White' : 'Blue';
-                    $style = 'class="option'.$tmp.'OFF" onmouseover="this.className=\'option'.$tmp.'ON\'" onmouseout="this.className=\'option'.$tmp.'OFF\'"';
-                    $i     = $i ? 0 : 1;
-
-                    switch ($article['type'])
-                    {
-                        case '1':
-                            $type = '<span class="kb_private">' . $hesklang['kb_private'] . '</span>';
-                            break;
-                        case '2':
-                            $type = '<span class="kb_draft">' . $hesklang['kb_draft'] . '</span>';
-                            break;
-                        default:
-                            $type = '<span class="kb_published">' . $hesklang['kb_published'] . '</span>';
-                    }
-
-                    if ($hesk_settings['kb_rating'])
-                    {
-                        $alt = $article['rating'] ? sprintf($hesklang['kb_rated'], sprintf("%01.1f", $article['rating'])) : $hesklang['kb_not_rated'];
-                        $rat = '<td><img src="../img/star_'.(hesk_round_to_half($article['rating'])*10).'.png" width="85" height="16" alt="'.$alt.'" title="'.$alt.'" border="0" style="vertical-align:text-bottom" /> ('.$article['votes'].') </td>';
-                    }
-                    else
-                    {
-                        $rat = '';
-                    }
-
-                    ?>
-                    <tr>
-                    <td><?php echo $j; ?>.</td>
-                    <td><?php echo $article['subject']; ?></td>
-                    <td><?php echo $type; ?></td>
-                    <td><?php echo $article['views']; ?></td>
-                    <?php echo $rat; ?>
-                    <td>
-                    <?php
-                    if ($num > 1)
-                    {
-                        if ($k == 1)
-                        {
-                        ?>
-                            <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+            <?php endif; ?>
+            <div class="<?php echo $secondCol; ?>">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h1 class="box-title">
+                            <?php echo sprintf($hesklang['articles_in_category_x'], '<strong>'.$this_cat['name']).'</strong>'; ?>
+                        </h1>
+                        <div class="box-tools pull-right">
+                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                <i class="fa fa-minus"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="box-body">
                         <?php
-                        }
-                        elseif ($k == $num)
+                        if ($num == 0)
                         {
-                        ?>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
-                            <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
-                        <?php
+                            echo '<p>'.$hesklang['kb_no_art'].'</p>';
                         }
                         else
                         {
-                        ?>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
-                            <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn'] ?>"></i></a>
-                        <?php
-                        }
-                    }
-                    elseif ( $num_sticky > 1 || $num_nosticky > 1 )
-                    {
-                        echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" /> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" />';
-                    }
-                    ?>
-                    <a href="manage_knowledgebase.php?a=sticky&amp;s=<?php echo $article['sticky'] ? 0 : 1 ?>&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-exclamation-triangle icon-link" style="color:<?php if ( ! $article['sticky']) {echo 'gray';} else {echo 'orange';} ?>" data-toggle="tooltip" data-placement="top" title="<?php if (!$article['sticky']) {echo $hesklang['stickyon'];} else {echo $hesklang['stickyoff'];} ?>"></i></a>
-                    <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o icon-link" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['viewart'] ?>"></i></a>
-                    <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil" style="color:orange;font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['edit'] ?>"></i></a>
-                    <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['delete'] ?>"></i></a>&nbsp;</td>
-                    </tr>
-                    <?php
-                    $j++;
-                    $k++;
-                } // End while
-                ?>
-                </table>
+                            /* Get number of sticky articles */
+                            $res2 = hesk_dbQuery("SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `catid`='{$catid}' AND `sticky` = '1' ");
+                            $num_sticky = hesk_dbResult($res2);
 
-		<?php
-    } ?>
+                            $num_nosticky = $num - $num_sticky;
 
+                            ?>
+                            <table class="table table-striped">
+                                <thead>
+                                <tr>
+                                    <th>&nbsp;</th>
+                                    <th><?php echo $hesklang['kb_subject']; ?></th>
+                                    <th><?php echo $hesklang['kb_type']; ?></th>
+                                    <th><?php echo $hesklang['views']; ?></th>
+                                    <?php
+                                    if ($hesk_settings['kb_rating'])
+                                    {
+                                        ?>
+                                        <th><?php echo $hesklang['rating'].' ('.$hesklang['votes'].')'; ?></th>
+                                        <?php
+                                    }
+                                    ?>
+                                    <th>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</th>
+                                </tr>
+                                </thead>
+                                <?php
 
-    </div>
-    </div>
+                                $i=1;
+                                $j=1;
+                                $k=1;
+                                $previous_sticky=1;
+                                $num = $num_sticky;
 
-     <?php   } // END if hide article list
+                                while ($article=hesk_dbFetchAssoc($result))
+                                {
 
-    echo '&nbsp;<br />&nbsp;';
+                                    if ($previous_sticky != $article['sticky'])
+                                    {
+                                        $k = 1;
+                                        $num = $num_nosticky;
+                                        $previous_sticky = $article['sticky'];
+                                    }
 
+                                    if (isset($_SESSION['artord']) && $article['id'] == $_SESSION['artord'])
+                                    {
+                                        unset($_SESSION['artord']);
+                                    }
+
+                                    $tmp   = $i ? 'White' : 'Blue';
+                                    $i     = $i ? 0 : 1;
+
+                                    switch ($article['type'])
+                                    {
+                                        case '1':
+                                            $type = '<span class="kb_private">' . $hesklang['kb_private'] . '</span>';
+                                            break;
+                                        case '2':
+                                            $type = '<span class="kb_draft">' . $hesklang['kb_draft'] . '</span>';
+                                            break;
+                                        default:
+                                            $type = '<span class="kb_published">' . $hesklang['kb_published'] . '</span>';
+                                    }
+
+                                    if ($hesk_settings['kb_rating'])
+                                    {
+                                        $alt = $article['rating'] ? sprintf($hesklang['kb_rated'], sprintf("%01.1f", $article['rating'])) : $hesklang['kb_not_rated'];
+                                        $rat = '<td><span data-toggle="tooltip" title="' . $alt . '">' . mfh_get_stars(hesk_round_to_half($article['rating'])) . '</span> (' . $article['votes'] . ')</td>';
+                                    }
+                                    else
+                                    {
+                                        $rat = '';
+                                    }
+
+                                    ?>
+                                    <tr>
+                                        <td><?php echo $j; ?>.</td>
+                                        <td><?php echo $article['subject']; ?></td>
+                                        <td><?php echo $type; ?></td>
+                                        <td><?php echo $article['views']; ?></td>
+                                        <?php echo $rat; ?>
+                                        <td>
+                                            <?php
+                                            if ($num > 1)
+                                            {
+                                                if ($k == 1)
+                                                {
+                                                    ?>
+                                                    <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
+                                                    <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                                                    <?php
+                                                }
+                                                elseif ($k == $num)
+                                                {
+                                                    ?>
+                                                    <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                    <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
+                                                    <?php
+                                                }
+                                                else
+                                                {
+                                                    ?>
+                                                    <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                    <a href="manage_knowledgebase.php?a=order_article&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['move_dn'] ?>"></i></a>
+                                                    <?php
+                                                }
+                                            }
+                                            elseif ( $num_sticky > 1 || $num_nosticky > 1 )
+                                            {
+                                                echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" /> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;vertical-align:text-bottom;" />';
+                                            }
+                                            ?>
+                                            <a href="manage_knowledgebase.php?a=sticky&amp;s=<?php echo $article['sticky'] ? 0 : 1 ?>&amp;id=<?php echo $article['id']; ?>&amp;catid=<?php echo $catid; ?>&amp;token=<?php hesk_token_echo(); ?>"><i class="glyphicon glyphicon-pushpin icon-link" style="color:<?php if ( ! $article['sticky']) {echo 'gray';} else {echo 'red';} ?>" data-toggle="tooltip" data-placement="top" title="<?php if (!$article['sticky']) {echo $hesklang['stickyon'];} else {echo $hesklang['stickyoff'];} ?>"></i></a>
+                                            <a href="knowledgebase_private.php?article=<?php echo $article['id']; ?>&amp;back=1<?php if ($article['type'] == 2) {echo '&amp;draft=1';} ?>" target="_blank"><i class="fa fa-file-o icon-link" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['viewart'] ?>"></i></a>
+                                            <a href="manage_knowledgebase.php?a=edit_article&amp;id=<?php echo $article['id']; ?>"><i class="fa fa-pencil" style="color:orange;font-size:16px" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['edit'] ?>"></i></a>
+                                            <a href="manage_knowledgebase.php?a=remove_article&amp;id=<?php echo $article['id']; ?>&amp;token=<?php hesk_token_echo(); ?>" onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_art']); ?>');"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="<?php echo $hesklang['delete'] ?>"></i></a>&nbsp;</td>
+                                    </tr>
+                                    <?php
+                                    $j++;
+                                    $k++;
+                                } // End while
+                                ?>
+                            </table>
+
+                            <?php
+                        } ?>
+                    </div>
+                    <div class="box-footer">
+                        <a href="manage_knowledgebase.php?a=add_article&amp;catid=<?php echo $catid; ?>" class="btn btn-success">
+                            <i class="fa fa-plus"></i>
+                            <?php echo $hesklang['kb_i_art2']; ?>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php endif; ?>
+    </section>
+
+	<?php
 	/* Clean unneeded session variables */
 	hesk_cleanSessionVars(array('hide','manage_cat','edit_article'));
 
@@ -2209,19 +2217,28 @@ function show_treeMenu() {
 	?>
 	<script src="<?php echo HESK_PATH; ?>inc/treemenu/TreeMenu_v25.js" language="JavaScript" type="text/javascript"></script>
 
-	<h3><?php echo $hesklang['kbstruct']; ?></h3>
-    <div class="footerWithBorder blankSpace"></div>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['kbstruct']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php $treeMenu->printMenu(); ?>
+            <i class="fa fa-plus icon-link green"></i> = <?php echo $hesklang['kb_p_art2']; ?><br />
+            <i class="fa fa-caret-right blue" style="font-size:18px"></i> = <?php echo $hesklang['kb_p_cat2']; ?><br />
+            <i class="fa fa-gear icon-link gray"></i> = <?php echo $hesklang['kb_p_man2']; ?><br />
+            <img src="../img/blank.gif" width="1" height="16" alt="" style="padding:1px" class="optionWhiteNbOFF" />(<span class="kb_published">1</span>, <span class="kb_private">2</span>, <span class="kb_draft">3</span>) = <?php echo $hesklang['xyz']; ?><br />
+        </div>
+    </div>
 
-		<?php
-		$treeMenu->printMenu();
-		?>
 
-	&nbsp;<br />
 
-	<i class="fa fa-plus icon-link green"></i> = <?php echo $hesklang['kb_p_art2']; ?><br />
-	<i class="fa fa-caret-right blue" style="font-size:18px"></i> = <?php echo $hesklang['kb_p_cat2']; ?><br />
-	<i class="fa fa-gear icon-link gray"></i> = <?php echo $hesklang['kb_p_man2']; ?><br />
-    <img src="../img/blank.gif" width="1" height="16" alt="" style="padding:1px" class="optionWhiteNbOFF" />(<span class="kb_published">1</span>, <span class="kb_private">2</span>, <span class="kb_draft">3</span>) = <?php echo $hesklang['xyz']; ?><br />
     <?php
 }
 
diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php
index 4b1fecef..1f3114d2 100644
--- a/admin/manage_permission_templates.php
+++ b/admin/manage_permission_templates.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_USERS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -96,23 +97,25 @@ while ($row = hesk_dbFetchAssoc($res)) {
     array_push($categories, $row);
 }
 ?>
-<div class="row move-down-20">
-    <div class="col-md-12">
-        <?php
-        hesk_handle_messages();
-        ?>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4><?php echo $hesklang['manage_permission_templates']; ?>
-                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="tooltip" data-placement="right"
-                       title="<?php echo $hesklang['manage_permission_templates_help']; ?>"></i>
-                    <span class="nu-floatRight panel-button">
-                        <a href="#" data-toggle="modal" data-target="#modal-template-new" class="btn btn-success nu-floatRight">
-                            <i class="fa fa-plus-circle"></i> <?php echo $hesklang['create_new_template']; ?>
-                        </a>
-                    </span>
-                </h4>
+<section class="content">
+    <?php hesk_handle_messages(); ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['manage_permission_templates']; ?>
+                <i class="fa fa-question-circle settingsquestionmark" data-toggle="tooltip" data-placement="right"
+                   title="<?php echo $hesklang['manage_permission_templates_help']; ?>"></i>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
+        </div>
+        <div class="box-body">
+            <a href="#" data-toggle="modal" data-target="#modal-template-new" class="btn btn-success nu-floatRight">
+                <i class="fa fa-plus-circle"></i> <?php echo $hesklang['create_new_template']; ?>
+            </a>
             <table class="table table-striped">
                 <thead>
                 <th><?php echo $hesklang['name']; ?></th>
@@ -129,23 +132,23 @@ while ($row = hesk_dbFetchAssoc($res)) {
                                 <i class="fa fa-pencil icon-link" data-toggle="tooltip"
                                    title="<?php echo $hesklang['view_permissions_for_this_template'] ?>"></i></a>
                             <?php if ($row['id'] == 1) { ?>
-                        <i class="fa fa-star icon-link orange" data-toggle="tooltip"
-                           title="<?php echo $hesklang['admin_cannot_be_staff']; ?>"></i></a>
-                    <?php } elseif ($row['heskprivileges'] == 'ALL' && $row['categories'] == 'ALL'){ ?>
-                        <a href="manage_permission_templates.php?a=deladmin&amp;id=<?php echo $row['id']; ?>">
-                            <i class="fa fa-star icon-link orange" data-toggle="tooltip"
-                                title="<?php echo $hesklang['template_has_admin_privileges']; ?>"></i></a>
-                    <?php } elseif ($row['id'] != 2) { ?>
-                        <a href="manage_permission_templates.php?a=addadmin&amp;id=<?php echo $row['id']; ?>">
-                            <i class="fa fa-star-o icon-link gray" data-toggle="tooltip"
-                               title="<?php echo $hesklang['template_has_no_admin_privileges']; ?>"></i></a>
-                    <?php
-                        } else {
-                    ?>
-                        <i class="fa fa-star-o icon-link gray" data-toggle="tooltip"
-                         title="<?php echo $hesklang['staff_cannot_be_admin']; ?>"></i>
-                    <?php
-                        }
+                                <i class="fa fa-star icon-link orange" data-toggle="tooltip"
+                                   title="<?php echo $hesklang['admin_cannot_be_staff']; ?>"></i></a>
+                            <?php } elseif ($row['heskprivileges'] == 'ALL' && $row['categories'] == 'ALL'){ ?>
+                                <a href="manage_permission_templates.php?a=deladmin&amp;id=<?php echo $row['id']; ?>">
+                                    <i class="fa fa-star icon-link orange" data-toggle="tooltip"
+                                       title="<?php echo $hesklang['template_has_admin_privileges']; ?>"></i></a>
+                            <?php } elseif ($row['id'] != 2) { ?>
+                                <a href="manage_permission_templates.php?a=addadmin&amp;id=<?php echo $row['id']; ?>">
+                                    <i class="fa fa-star-o icon-link gray" data-toggle="tooltip"
+                                       title="<?php echo $hesklang['template_has_no_admin_privileges']; ?>"></i></a>
+                                <?php
+                            } else {
+                                ?>
+                                <i class="fa fa-star-o icon-link gray" data-toggle="tooltip"
+                                   title="<?php echo $hesklang['staff_cannot_be_admin']; ?>"></i>
+                                <?php
+                            }
                             if ($row['id'] != 1 && $row['id'] != 2):
                                 ?>
                                 <a href="manage_permission_templates.php?a=delete&amp;id=<?php echo $row['id']; ?>">
@@ -159,7 +162,7 @@ while ($row = hesk_dbFetchAssoc($res)) {
             </table>
         </div>
     </div>
-</div>
+</section>
 <?php
 foreach ($templates as $template) {
     createEditModal($template, $featureArray, $categories);
@@ -207,8 +210,10 @@ function createEditModal($template, $features, $categories)
                     <div class="modal-body">
                         <div class="row">
                             <?php if ($showNotice): ?>
-                                <div class="alert alert-info">
-                                    <i class="fa fa-info-circle"></i> <?php echo $hesklang['template_is_admin_cannot_change']; ?>
+                                <div class="col-sm-12">
+                                    <div class="alert alert-info">
+                                        <i class="fa fa-info-circle"></i> <?php echo $hesklang['template_is_admin_cannot_change']; ?>
+                                    </div>
                                 </div>
                             <?php endif; ?>
                             <div class="form-group">
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index 88c6b845..96138f76 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -9,6 +9,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -45,318 +46,325 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-    <div class="row pad-20">
-        <ul class="nav nav-tabs" role="tablist">
-            <?php
-            // Show a link to banned_emails.php if user has permission
-            if (hesk_checkPermission('can_ban_emails', 0)) {
-                echo '
+<section class="content">
+    <div class="box">
+        <div class="box-body">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs" role="tablist">
+                    <?php
+                    // Show a link to banned_emails.php if user has permission
+                    if (hesk_checkPermission('can_ban_emails', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banemail'] . '" href="banned_emails.php">' . $hesklang['banemail'] . '</a>
             </li>
             ';
-            }
-            if (hesk_checkPermission('can_ban_ips', 0)) {
-                echo '
+                    }
+                    if (hesk_checkPermission('can_ban_ips', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banip'] . '" href="banned_ips.php">' . $hesklang['banip'] . '</a>
             </li>';
-            }
-            // Show a link to status_message.php if user has permission to do so
-            if (hesk_checkPermission('can_service_msg', 0)) {
-                echo '
+                    }
+                    // Show a link to status_message.php if user has permission to do so
+                    if (hesk_checkPermission('can_service_msg', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['sm_title'] . '" href="service_messages.php">' . $hesklang['sm_title'] . '</a>
             </li>';
-            }
-            if (hesk_checkPermission('can_man_email_tpl', 0)) {
-                echo '
+                    }
+                    if (hesk_checkPermission('can_man_email_tpl', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['email_templates'] . '" href="manage_email_templates.php">' . $hesklang['email_templates'] . '</a>
             </li>
             ';
-            }
-            ?>
-            <li role="presentation" class="active">
-                <a href="#"><?php echo $hesklang['statuses']; ?> <i class="fa fa-question-circle settingsquestionmark"
-                                                                    data-toggle="popover"
-                                                                    title="<?php echo $hesklang['statuses']; ?>"
-                                                                    data-content="<?php echo $hesklang['statuses_intro']; ?>"></i></a>
-            </li>
-        </ul>
-        <div class="tab-content summaryList tabPadding">
-            <div class="row">
-                <div class="col-md-12">
-                    <?php
-                    /* This will handle error, success and notice messages */
-                    hesk_handle_messages();
-
-                    //-- We need to get all of the statuses and dump the information to the page.
-                    $numOfStatusesRS = hesk_dbQuery('SELECT 1 FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses`');
-                    $numberOfStatuses = hesk_dbNumRows($numOfStatusesRS);
-
-                    $statuses = mfh_getAllStatuses();
+                    }
                     ?>
-                    <form class="form-horizontal" method="post" action="manage_statuses.php" role="form">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4>
-                                    <?php echo $hesklang['statuses']; ?>
-                                    <span class="nu-floatRight panel-button">
-                                        <button type="button" class="btn btn-success" data-toggle="modal" data-target="#modal-status-new">
-                                            <i class="fa fa-plus-circle"></i>
-                                            <?php
-                                            echo $hesklang['new_status'];
+                    <li role="presentation" class="active">
+                        <a href="#"><?php echo $hesklang['statuses']; ?> <i class="fa fa-question-circle settingsquestionmark"
+                                                                            data-toggle="popover"
+                                                                            title="<?php echo $hesklang['statuses']; ?>"
+                                                                            data-content="<?php echo $hesklang['statuses_intro']; ?>"></i></a>
+                    </li>
+                </ul>
+                <div class="tab-content summaryList tabPadding">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <?php
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
+
+                            //-- We need to get all of the statuses and dump the information to the page.
+                            $numOfStatusesRS = hesk_dbQuery('SELECT 1 FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses`');
+                            $numberOfStatuses = hesk_dbNumRows($numOfStatusesRS);
+
+                            $statuses = mfh_getAllStatuses();
+                            ?>
+                            <form class="form-horizontal" method="post" action="manage_statuses.php" role="form">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h4>
+                                            <?php echo $hesklang['statuses']; ?>
+                                            <span style="float: right; margin-top: -7px">
+                                                <button type="button" class="btn btn-success" data-toggle="modal" data-target="#modal-status-new">
+                                                    <i class="fa fa-plus-circle"></i>
+                                                    <?php
+                                                    echo $hesklang['new_status'];
+                                                    ?>
+                                                </button>
+                                            </span>
+                                        </h4>
+                                    </div>
+                                    <table class="table table-hover">
+                                        <thead>
+                                        <tr>
+                                            <th><?php echo $hesklang['name']; ?></th>
+                                            <th><?php echo $hesklang['closable_question']; ?></th>
+                                            <th><?php echo $hesklang['closedQuestionMark']; ?></th>
+                                            <th><?php echo $hesklang['actions']; ?></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <?php
+                                        $j = 1;
+                                        foreach ($statuses as $key => $row):
                                             ?>
-                                        </button>
-                                    </span>
-                                </h4>
-                            </div>
-                            <table class="table table-hover">
-                                <thead>
-                                <tr>
-                                    <th><?php echo $hesklang['name']; ?></th>
-                                    <th><?php echo $hesklang['closable_question']; ?></th>
-                                    <th><?php echo $hesklang['closedQuestionMark']; ?></th>
-                                    <th><?php echo $hesklang['actions']; ?></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <?php
-                                $j = 1;
-                                foreach ($statuses as $key => $row):
-                                    ?>
-                                    <tr id="s<?php echo $row['ID']; ?>_row">
-                                        <td class="bold" style="color: <?php echo $row['TextColor']; ?>">
-                                            <?php echo $row['text']; ?>
-                                        </td>
-                                        <td>
-                                            <?php
-                                            if ($row['Closable'] == 'yes') {
-                                                echo $hesklang['yes_title_case'];
-                                            } elseif ($row['Closable'] == 'conly') {
-                                                echo $hesklang['customers_only'];
-                                            } elseif ($row['Closable'] == 'sonly') {
-                                                echo $hesklang['staff_only'];
-                                            } elseif ($row['Closable'] == 'no') {
-                                                echo $hesklang['no_title_case'];
-                                            }
-                                            ?>
-                                        </td>
-                                        <td>
-                                            <?php
-                                            if ($row['IsClosed']) {
-                                                echo '<i class="fa fa-check-circle icon-link green"></i>';
-                                            }
-                                            ?>
-                                        </td>
-                                        <td>
+                                            <tr id="s<?php echo $row['ID']; ?>_row">
+                                                <td class="bold" style="color: <?php echo $row['TextColor']; ?>">
+                                                    <?php echo $row['text']; ?>
+                                                </td>
+                                                <td>
+                                                    <?php
+                                                    if ($row['Closable'] == 'yes') {
+                                                        echo $hesklang['yes_title_case'];
+                                                    } elseif ($row['Closable'] == 'conly') {
+                                                        echo $hesklang['customers_only'];
+                                                    } elseif ($row['Closable'] == 'sonly') {
+                                                        echo $hesklang['staff_only'];
+                                                    } elseif ($row['Closable'] == 'no') {
+                                                        echo $hesklang['no_title_case'];
+                                                    }
+                                                    ?>
+                                                </td>
+                                                <td>
+                                                    <?php
+                                                    if ($row['IsClosed']) {
+                                                        echo '<i class="fa fa-check-circle icon-link green"></i>';
+                                                    }
+                                                    ?>
+                                                </td>
+                                                <td>
                                         <span data-toggle="modal" data-target="#modal-status-<?php echo $row['ID']; ?>"
                                               style="cursor: pointer;">
                                             <i class="fa fa-pencil icon-link orange"
                                                data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
                                         </span>
-                                            <?php echoArrows($j, $numberOfStatuses, $row['ID'], $modsForHesk_settings); ?>
-                                            <?php
-                                            // Only show the delete button if (1) it's not a default action and (2) no tickets are set to that status
-                                            $delete = canStatusBeDeleted($row['ID']);
-                                            $cursor = 'cursor: pointer';
-                                            $iconStyle = 'color: red';
-                                            $dataTarget = 'data-target="#modal-status-delete-' . $row['ID'] . '"';
-                                            $tooltip = $hesklang['delete'];
-                                            if ($delete == 'no-default' || $delete == 'no-tickets') {
-                                                $cursor = '';
-                                                $dataTarget = '';
-                                                $iconStyle = 'color: grey';
-                                            }
-                                            if ($delete == 'no-default') {
-                                                $tooltip = $hesklang['whyCantIDeleteThisStatusReason'];
-                                            } elseif ($delete == 'no-tickets') {
-                                                $tooltip = $hesklang['cannot_delete_status_tickets'];
-                                            }
-                                            ?>
-                                            <span data-toggle="modal" <?php echo $dataTarget; ?>
-                                                  style="<?php echo $cursor; ?>;">
+                                                    <?php echoArrows($j, $numberOfStatuses, $row['ID'], $modsForHesk_settings); ?>
+                                                    <?php
+                                                    // Only show the delete button if (1) it's not a default action and (2) no tickets are set to that status
+                                                    $delete = canStatusBeDeleted($row['ID']);
+                                                    $cursor = 'cursor: pointer';
+                                                    $iconStyle = 'color: red';
+                                                    $dataTarget = 'data-target="#modal-status-delete-' . $row['ID'] . '"';
+                                                    $tooltip = $hesklang['delete'];
+                                                    if ($delete == 'no-default' || $delete == 'no-tickets') {
+                                                        $cursor = '';
+                                                        $dataTarget = '';
+                                                        $iconStyle = 'color: grey';
+                                                    }
+                                                    if ($delete == 'no-default') {
+                                                        $tooltip = $hesklang['whyCantIDeleteThisStatusReason'];
+                                                    } elseif ($delete == 'no-tickets') {
+                                                        $tooltip = $hesklang['cannot_delete_status_tickets'];
+                                                    }
+                                                    ?>
+                                                    <span data-toggle="modal" <?php echo $dataTarget; ?>
+                                                          style="<?php echo $cursor; ?>;">
                                             <i class="fa fa-times icon-link" style="<?php echo $iconStyle; ?>"
                                                data-toggle="tooltip" title="<?php echo $tooltip; ?>"></i>
                                         </span>
-                                        </td>
-                                    </tr>
-                                    <?php
-                                    $j++;
-                                endforeach; ?>
-                                </tbody>
-                            </table>
+                                                </td>
+                                            </tr>
+                                            <?php
+                                            $j++;
+                                        endforeach; ?>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h4><?php echo $hesklang['defaultStatusForAction']; ?></h4>
+                                    </div>
+                                    <div class="panel-body">
+                                        <div class="form-group">
+                                            <label for="newTicket"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isNewTicketMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="newTicket" class="form-control" id="newTicket">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 1) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsNewTicketStatus'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="closedByClient"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isClosedByClientMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="closedByClient" class="form-control" id="closedByClient">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 0) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsClosedByClient'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="replyFromClient"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isRepliedByClientMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="replyFromClient" class="form-control" id="replyFromClient">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 1) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsCustomerReplyStatus'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="staffClosedOption"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isStaffClosedOptionMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="staffClosedOption" class="form-control" id="staffClosedOption">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 0) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsStaffClosedOption'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="staffReopenedStatus"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isStaffReopenedStatusMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="staffReopenedStatus" class="form-control"
+                                                        id="staffReopenedStatus">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 1) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsStaffReopenedStatus'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="defaultStaffReplyStatus"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isDefaultStaffReplyStatusMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="defaultStaffReplyStatus" class="form-control"
+                                                        id="defaultStaffReplyStatus">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 1) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsDefaultStaffReplyStatus'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="lockedTicketStatus"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['lockedTicketStatusMsg']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="lockedTicketStatus" class="form-control" id="lockedTicketStatus">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        $selectedEcho = ($row['LockedTicketStatus'] == 1) ? 'selected="selected"' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="autocloseTicketOption"
+                                                   class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['autoclose_ticket_status']; ?></label>
+
+                                            <div class="col-sm-6 col-xs-12">
+                                                <select name="autocloseTicketOption" class="form-control"
+                                                        id="autocloseTicketOption">
+                                                    <?php
+                                                    foreach ($statuses as $key => $row) {
+                                                        if ($row['IsClosed'] == 0) {
+                                                            continue;
+                                                        }
+
+                                                        $selectedEcho = ($row['IsAutocloseOption'] == 1) ? 'selected' : '';
+                                                        echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
+                                                    }
+                                                    ?>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6 col-sm-offset-6">
+                                    <input type="hidden" name="a" value="save">
+                                    <input type="submit" class="btn btn-default"
+                                           value="<?php echo $hesklang['save_changes']; ?>">
+                                </div>
+                            </form>
                         </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4><?php echo $hesklang['defaultStatusForAction']; ?></h4>
-                            </div>
-                            <div class="panel-body">
-                                <div class="form-group">
-                                    <label for="newTicket"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isNewTicketMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="newTicket" class="form-control" id="newTicket">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 1) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsNewTicketStatus'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="closedByClient"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isClosedByClientMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="closedByClient" class="form-control" id="closedByClient">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 0) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsClosedByClient'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="replyFromClient"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isRepliedByClientMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="replyFromClient" class="form-control" id="replyFromClient">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 1) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsCustomerReplyStatus'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="staffClosedOption"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isStaffClosedOptionMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="staffClosedOption" class="form-control" id="staffClosedOption">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 0) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsStaffClosedOption'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="staffReopenedStatus"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isStaffReopenedStatusMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="staffReopenedStatus" class="form-control"
-                                                id="staffReopenedStatus">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 1) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsStaffReopenedStatus'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="defaultStaffReplyStatus"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['isDefaultStaffReplyStatusMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="defaultStaffReplyStatus" class="form-control"
-                                                id="defaultStaffReplyStatus">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 1) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsDefaultStaffReplyStatus'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="lockedTicketStatus"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['lockedTicketStatusMsg']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="lockedTicketStatus" class="form-control" id="lockedTicketStatus">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                $selectedEcho = ($row['LockedTicketStatus'] == 1) ? 'selected="selected"' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="autocloseTicketOption"
-                                           class="col-sm-6 col-xs-12 control-label"><?php echo $hesklang['autoclose_ticket_status']; ?></label>
-
-                                    <div class="col-sm-6 col-xs-12">
-                                        <select name="autocloseTicketOption" class="form-control"
-                                                id="autocloseTicketOption">
-                                            <?php
-                                            foreach ($statuses as $key => $row) {
-                                                if ($row['IsClosed'] == 0) {
-                                                    continue;
-                                                }
-
-                                                $selectedEcho = ($row['IsAutocloseOption'] == 1) ? 'selected' : '';
-                                                echo '<option value="' . $row['ID'] . '" ' . $selectedEcho . '>' . mfh_getDisplayTextForStatusId($row['ID']) . '</option>';
-                                            }
-                                            ?>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6 col-sm-offset-6">
-                            <input type="hidden" name="a" value="save">
-                            <input type="submit" class="btn btn-default"
-                                   value="<?php echo $hesklang['save_changes']; ?>">
-                        </div>
-                    </form>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
+</section>
+
+
 
 <?php
 foreach ($statuses as $status) {
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index b242e354..5f60a975 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CANNED');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -78,10 +79,6 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
 
-<div class="row">
-
-</div>
-
 <script language="javascript" type="text/javascript"><!--
     function confirm_delete() {
         if (confirm('<?php echo hesk_makeJsString($hesklang['delete_tpl']); ?>')) {
@@ -105,141 +102,159 @@ $i = 1;
 $j = 0;
 $num = hesk_dbNumRows($result);
 ?>
-<div class="row move-down-20">
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
                 <?php echo $hesklang['saved_ticket_tpl']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
-            <div class="panel-body">
-                <?php if ($num < 1) {
-                    echo '<p>' . $hesklang['no_ticket_tpl'] . '</p>';
-                } else {
-                    ?>
-                    <table class="table table-hover">
-                        <thead>
-                        <tr>
-                            <th><?php echo $hesklang['ticket_tpl_title']; ?></th>
-                            <th><?php echo $hesklang['opt']; ?></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
+        </div>
+        <div class="box-body">
+            <?php if ($num < 1) {
+                echo '<p>' . $hesklang['no_ticket_tpl'] . '</p>';
+            } else {
+                ?>
+                <table class="table table-hover">
+                    <thead>
+                    <tr>
+                        <th><?php echo $hesklang['ticket_tpl_title']; ?></th>
+                        <th><?php echo $hesklang['opt']; ?></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
 
-                        while ($mysaved = hesk_dbFetchAssoc($result)) {
-                            $j++;
-                            $color = '';
-                            if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2']) {
-                                $color = 'success';
-                                unset($_SESSION['canned']['selcat2']);
-                            }
+                    while ($mysaved = hesk_dbFetchAssoc($result)) {
+                        $j++;
+                        $color = '';
+                        if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2']) {
+                            $color = 'success';
+                            unset($_SESSION['canned']['selcat2']);
+                        }
 
-                            $options .= '<option class="form-control" value="' . $mysaved['id'] . '"';
-                            $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
-                            $options .= '>' . $mysaved['title'] . '</option>';
+                        $options .= '<option class="form-control" value="' . $mysaved['id'] . '"';
+                        $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
+                        $options .= '>' . $mysaved['title'] . '</option>';
 
-                            if ($modsForHesk_settings['rich_text_for_tickets']) {
-                                $theMessage = html_entity_decode($mysaved['message']);
-                                $theMessage = addslashes($theMessage);
-                                $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", $theMessage) . "';\n";
-                            } else {
-                                $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", addslashes($mysaved['message'])) . "';\n";
-                            }
-                            $javascript_titles .= 'myTitle[' . $mysaved['id'] . ']=\'' . addslashes($mysaved['title']) . "';\n";
+                        if ($modsForHesk_settings['rich_text_for_tickets']) {
+                            $theMessage = html_entity_decode($mysaved['message']);
+                            $theMessage = addslashes($theMessage);
+                            $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", $theMessage) . "';\n";
+                        } else {
+                            $javascript_messages .= 'myMsgTxt[' . $mysaved['id'] . ']=\'' . str_replace("\r\n", "\\r\\n' + \r\n'", addslashes($mysaved['message'])) . "';\n";
+                        }
+                        $javascript_titles .= 'myTitle[' . $mysaved['id'] . ']=\'' . addslashes($mysaved['title']) . "';\n";
 
-                            echo '
+                        echo '
                                     <tr>
                                     <td>' . $mysaved['title'] . '</td>
                                     <td class="text-left">
                                     ';
 
-                            if ($num > 1) {
-                                if ($j == 1) {
-                                    echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
+                        if ($num > 1) {
+                            if ($j == 1) {
+                                echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />
                                         <a href="manage_ticket_templates.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '">
                                             <i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['move_dn'] . '"></i></a>';
-                                } elseif ($j == $num) {
-                                    echo '<a href="manage_ticket_templates.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                                } else {
-                                    echo '
+                            } elseif ($j == $num) {
+                                echo '<a href="manage_ticket_templates.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                            } else {
+                                echo '
                                         <a href="manage_ticket_templates.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['move_up'] . '"></i></a>
                                         <a href="manage_ticket_templates.php?a=order&amp;replyid=' . $mysaved['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['move_dn'] . '"></i></a>
                                         ';
-                                }
-                            } else {
-                                echo '';
                             }
+                        } else {
+                            echo '';
+                        }
 
-                            echo '
+                        echo '
                                     <a href="manage_ticket_templates.php?a=remove&amp;id=' . $mysaved['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" data-original-title="' . $hesklang['delete'] . '"></i></a></td>
                                     </tr>
                                     ';
-                        } // End while
+                    } // End while
 
-                        ?>
-                        </tbody>
-                    </table>
-                    <?php
-                }
-                ?>
-            </div>
-        </div>
-    </div>
-    <div class="col-md-8">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-
-        $onsubmit = '';
-        if ($modsForHesk_settings['rich_text_for_tickets']) {
-            $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
-        }
-        ?>
-        <form class="form-horizontal" action="manage_ticket_templates.php" method="post" name="form1" role="form" data-toggle="validator" <?php echo $onsubmit; ?>>
-            <h3><?php echo $hesklang['new_ticket_tpl']; ?> <a href="javascript:void(0)"
-                                                              onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['ticket_tpl_intro']); ?>')"><i
-                        class="fa fa-question-circle settingsquestionmark"></i></a></h3>
-
-            <div class="footerWithBorder blankSpace"></div>
-            <?php
-            if ($num > 0) {
-                ?>
-                <div class="form-group">
-                    <div class="col-sm-12">
-                        <div class="radio">
-                            <label>
-                                <input type="radio" name="a"
-                                       value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked=' : ''; ?>>
-                                <?php echo $hesklang['ticket_tpl_add']; ?>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="radio">
-                                <label>
-                                    <input type="radio" name="a"
-                                           value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked' : ''; ?>>
-                                    <?php echo $hesklang['ticket_tpl_edit']; ?>
-                                </label>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
-                                <option value="0"> - <?php echo $hesklang['select_empty']; ?>-
-                                </option><?php echo $options; ?></select>
-                        </div>
-                    </div>
-                </div>
+                    ?>
+                    </tbody>
+                </table>
                 <?php
-            } else {
-                echo '<p><input type="hidden" name="a" value="new" /> ' . $hesklang['ticket_tpl_add'] . '</label></p>';
             }
             ?>
-            <div class="form-group">
-                <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['ticket_tpl_title']; ?></label>
+        </div>
+    </div>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['new_ticket_tpl']; ?>
+                <a href="javascript:void(0)"
+                   onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['ticket_tpl_intro']); ?>')"><i
+                        class="fa fa-question-circle settingsquestionmark"></i></a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
 
-                <div class="col-sm-10">
+            $onsubmit = '';
+            if ($modsForHesk_settings['rich_text_for_tickets']) {
+                $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
+            }
+            ?>
+            <form class="form-horizontal" action="manage_ticket_templates.php" method="post" name="form1" role="form" data-toggle="validator" <?php echo $onsubmit; ?>>
+                <?php
+                if ($num > 0) {
+                    ?>
+                    <div class="form-group">
+                        <div class="col-sm-12">
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="a"
+                                                   value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked=' : ''; ?>>
+                                            <?php echo $hesklang['ticket_tpl_add']; ?>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="a"
+                                                   value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked' : ''; ?>>
+                                            <?php echo $hesklang['ticket_tpl_edit']; ?>
+                                        </label>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
+                                        <option value="0"> - <?php echo $hesklang['select_empty']; ?>-
+                                        </option><?php echo $options; ?></select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <?php
+                } else {
+                    echo '<p><input type="hidden" name="a" value="new" /> ' . $hesklang['ticket_tpl_add'] . '</label></p>';
+                }
+                ?>
+                <div class="form-group">
+                    <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['ticket_tpl_title']; ?></label>
+
+                    <div class="col-sm-10">
                     <span id="HeskTitle">
                         <input id="subject" class="form-control" type="text" name="name" size="40" maxlength="50"
                                data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
@@ -248,13 +263,13 @@ $num = hesk_dbNumRows($result);
                                 echo ' value="' . stripslashes($_SESSION['canned']['name']) . '" ';
                             } ?> required>
                     </span>
-                    <div class="help-block with-errors"></div>
+                        <div class="help-block with-errors"></div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" id="message-group">
-                <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?></label>
+                <div class="form-group" id="message-group">
+                    <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?></label>
 
-                <div class="col-sm-10">
+                    <div class="col-sm-10">
                     <span id="HeskMsg">
                         <textarea id="message" class="form-control htmlEditor"
                                   data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
@@ -269,18 +284,19 @@ $num = hesk_dbNumRows($result);
                             }
                             ?></textarea>
                     </span>
-                    <div class="help-block with-errors" id="message-help-block"></div>
+                        <div class="help-block with-errors" id="message-help-block"></div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-10 col-sm-offset-2">
-                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                    <input type="submit" value="<?php echo $hesklang['save_ticket_tpl']; ?>" class="btn btn-default">
+                <div class="form-group">
+                    <div class="col-sm-10 col-sm-offset-2">
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                        <input type="submit" value="<?php echo $hesklang['save_ticket_tpl']; ?>" class="btn btn-default">
+                    </div>
                 </div>
-            </div>
-        </form>
+            </form>
+        </div>
     </div>
-</div>
+</section>
 <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
     <script type="text/javascript">
         /* <![CDATA[ */
diff --git a/admin/manage_users.php b/admin/manage_users.php
index f005e94d..767b0da8 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -38,6 +38,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/profile_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -169,38 +170,60 @@ if ($action = hesk_REQUEST('a')) {
         unset($_SESSION['edit_userdata']);
     }
 
+
     /* Print header */
     require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
-
-    /* Print main manage users page */
     require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
     ?>
-
-    <div class="row move-down-20">
-        <div class="col-md-10 col-md-offset-1">
-            <script language="Javascript" type="text/javascript"><!--
-                function confirm_delete() {
-                    if (confirm('<?php echo addslashes($hesklang['sure_remove_user']); ?>')) {
-                        return true;
-                    }
-                    else {
-                        return false;
-                    }
-                }
-                //-->
-            </script>
-
-            <?php
-            /* This will handle error, success and notice messages */
-            hesk_handle_messages();
-            ?>
-
-            <h3 style="padding-bottom:5px"><?php echo $hesklang['manage_users']; ?> <a href="javascript:void(0)"
-                                                                                       onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['users_intro']); ?>')"><i
-                        class="fa fa-question-circle settingsquestionmark"></i></a></h3>
-
-            <div class="footerWithBorder blankSpace"></div>
-
+<section class="content">
+    <?php hesk_handle_messages(); ?>
+    <script language="Javascript" type="text/javascript"><!--
+        function confirm_delete() {
+            if (confirm('<?php echo addslashes($hesklang['sure_remove_user']); ?>')) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        //-->
+    </script>
+    <div class="box collapsed-box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['add_user']; ?>
+                <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['users_intro']); ?>')">
+                    <i class="fa fa-question-circle settingsquestionmark"></i>
+                </a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-plus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php echo $hesklang['req_marked_with']; ?> <span class="red">*</span>
+            <form data-toggle="validator" name="form1" method="post" action="manage_users.php" class="form-horizontal" role="form">
+                <?php hesk_profile_tab('userdata', false, 'create_user'); ?>
+            </form>
+        </div>
+    </div>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['manage_users']; ?>
+                <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['users_intro']); ?>')">
+                    <i class="fa fa-question-circle settingsquestionmark"></i>
+                </a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
             <table class="table table-hover">
                 <tr>
                     <th><b><i><?php echo $hesklang['name']; ?></i></b></th>
@@ -329,29 +352,15 @@ EOC;
             } ?>
         </div>
     </div>
-    <div class="row">
-        <div class="col-md-10 col-md-offset-1">
-            <h3><?php echo $hesklang['add_user']; ?></h3>
-            <h6><?php echo $hesklang['req_marked_with']; ?> <font class="important">*</font></h6>
-
-            <div class="footerWithBorder blankSpace"></div>
-
-            <form data-toggle="validator" name="form1" method="post" action="manage_users.php" class="form-horizontal" role="form">
-                <?php hesk_profile_tab('userdata', false, 'create_user'); ?>
-            </form>
-        </div>
-    </div>
-
     <script language="Javascript" type="text/javascript"><!--
         hesk_checkPassword(document.form1.newpass.value);
         //-->
     </script>
+</section>
 
-    <p>&nbsp;</p>
-
-    <?php
-    require_once(HESK_PATH . 'inc/footer.inc.php');
-    exit();
+<?php
+require_once(HESK_PATH . 'inc/footer.inc.php');
+exit();
 
 } // End else
 
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index c605b9dc..cedc18e8 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -41,6 +41,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/view_attachment_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -121,1026 +122,1037 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print admin navigation */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
-$columnWidth = 'col-md-8';
 $showRs = hesk_dbQuery("SELECT `show` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "quick_help_sections` WHERE `id` = 5");
 $show = hesk_dbFetchAssoc($showRs);
-if (!$show['show']) {
-    $columnWidth = 'col-md-10 col-md-offset-1';
-}
+$show_quick_help = $show['show'];
 ?>
 
 <ol class="breadcrumb">
     <li><a href="admin_main.php"><?php echo $hesk_settings['hesk_title']; ?></a></li>
     <li class="active"><?php echo $hesklang['nti2']; ?></li>
 </ol>
-<div class="row move-down-20">
-    <?php if ($columnWidth == 'col-md-8'): ?>
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="panel-heading"><?php echo $hesklang['quick_help']; ?></div>
-                <div class="panel-body">
-                    <p><?php echo $hesklang['nti3']; ?></p>
-                    <br/>
+<section class="content">
+    <?php
+    /* This will handle error, success and notice messages */
+    hesk_handle_messages();
 
-                    <p><?php echo $hesklang['req_marked_with']; ?> <font class="important">*</font></p>
-                </div>
+    if ($show_quick_help): ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['quick_help']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
         </div>
+        <div class="box-body">
+            <p><?php echo $hesklang['nti3']; ?></p>
+            <br>
+
+            <p><?php echo $hesklang['req_marked_with']; ?> <span class="important">*</span></p>
+        </div>
+    </div>
     <?php endif; ?>
-    <div class="<?php echo $columnWidth; ?>">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-        ?>
-        <h3><?php echo $hesklang['nti2']; ?></h3>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['nti2']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <!-- START FORM -->
+            <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
+                <script type="text/javascript">
+                    /* <![CDATA[ */
+                    tinyMCE.init({
+                        mode: "textareas",
+                        editor_selector: "htmlEditor",
+                        elements: "content",
+                        theme: "advanced",
+                        convert_urls: false,
 
-        <div class="footerWithBorder blankSpace"></div>
+                        theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
+                        theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
+                        theme_advanced_buttons3: "",
 
-        <!-- START FORM -->
-        <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
-            <script type="text/javascript">
-                /* <![CDATA[ */
-                tinyMCE.init({
-                    mode: "textareas",
-                    editor_selector: "htmlEditor",
-                    elements: "content",
-                    theme: "advanced",
-                    convert_urls: false,
+                        theme_advanced_toolbar_location: "top",
+                        theme_advanced_toolbar_align: "left",
+                        theme_advanced_statusbar_location: "bottom",
+                        theme_advanced_resizing: true
+                    });
+                    /* ]]> */
+                </script>
+            <?php endif;
 
-                    theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                    theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                    theme_advanced_buttons3: "",
+            $onsubmit = '';
+            if ($modsForHesk_settings['rich_text_for_tickets']) {
+                $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
+            }
+            ?>
+            <form role="form" class="form-horizontal" method="post" action="admin_submit_ticket.php" name="form1"
+                  enctype="multipart/form-data" <?php echo $onsubmit; ?>>
+                <?php if ($hesk_settings['can_sel_lang']) { ?>
+                    <div class="form-group">
+                        <label for="customerLanguage" class="col-sm-3 control-label"><?php echo $hesklang['chol']; ?>:&nbsp;<span
+                                class="important">*</span></label>
 
-                    theme_advanced_toolbar_location: "top",
-                    theme_advanced_toolbar_align: "left",
-                    theme_advanced_statusbar_location: "bottom",
-                    theme_advanced_resizing: true
-                });
-                /* ]]> */
-            </script>
-        <?php endif;
-
-        $onsubmit = '';
-        if ($modsForHesk_settings['rich_text_for_tickets']) {
-            $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
-        }
-        ?>
-        <form role="form" class="form-horizontal" method="post" action="admin_submit_ticket.php" name="form1"
-              enctype="multipart/form-data" <?php echo $onsubmit; ?>>
-            <?php if ($hesk_settings['can_sel_lang']) { ?>
-                <div class="form-group">
-                    <label for="customerLanguage" class="col-sm-3 control-label"><?php echo $hesklang['chol']; ?>:&nbsp;<span
+                        <div class="col-sm-9">
+                            <select name="customerLanguage" id="customerLanguage" class="form-control">
+                                <?php hesk_listLanguages(); ?>
+                            </select>
+                        </div>
+                    </div>
+                <?php } ?>
+                <!-- Contact info -->
+                <?php
+                $has_error = '';
+                if (in_array('name', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                }?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?><span
                             class="important">*</span></label>
 
                     <div class="col-sm-9">
-                        <select name="customerLanguage" id="customerLanguage" class="form-control">
-                            <?php hesk_listLanguages(); ?>
-                        </select>
+                        <input type="text" class="form-control" name="name" size="40" maxlength="30"
+                               value="<?php if (isset($_SESSION['as_name'])) {
+                                   echo stripslashes(hesk_input($_SESSION['as_name']));
+                               } else if (isset($_GET['name'])) {
+                                   echo hesk_GET('name');
+                               } ?>"
+                               data-error="<?php echo htmlspecialchars($hesklang['enter_your_name']); ?>"
+                               placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>" required>
+                        <div class="help-block with-errors"></div>
                     </div>
                 </div>
-            <?php } ?>
-            <!-- Contact info -->
-            <?php if (in_array('name', $_SESSION['iserror'])) {
-                echo '<div class="form-group has-error">';
-            } else {
-                echo '<div class="form-group">';
-            } ?>
-            <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?><span
-                    class="important">*</span></label>
+                <div class="form-group">
+                    <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?></label>
 
-            <div class="col-sm-9">
-                <input type="text" class="form-control" name="name" size="40" maxlength="30"
-                       value="<?php if (isset($_SESSION['as_name'])) {
-                           echo stripslashes(hesk_input($_SESSION['as_name']));
-                       } else if (isset($_GET['name'])) {
-                           echo hesk_GET('name');
-                       } ?>"
-                       data-error="<?php echo htmlspecialchars($hesklang['enter_your_name']); ?>"
-                       placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>" required>
-                <div class="help-block with-errors"></div>
-            </div>
-    </div>
-    <div class="form-group">
-        <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?></label>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="email" size="40" maxlength="1000" id="email-input"
+                               value="<?php if (isset($_SESSION['as_email'])) {
+                                   echo stripslashes(hesk_input($_SESSION['as_email']));
+                               } else if (isset($_GET['email'])) {
+                                   echo hesk_GET('email');
+                               } ?>" <?php if ($hesk_settings['detect_typos']) {
+                            echo ' onblur="Javascript:hesk_suggestEmail(1)"';
+                        } ?>
+                               placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"
+                               onkeyup="disableIfEmpty('email-input','notify-email')">
+                    </div>
 
-        <div class="col-sm-9">
-            <input type="text" class="form-control" name="email" size="40" maxlength="1000" id="email-input"
-                   value="<?php if (isset($_SESSION['as_email'])) {
-                       echo stripslashes(hesk_input($_SESSION['as_email']));
-                   } else if (isset($_GET['email'])) {
-                       echo hesk_GET('email');
-                   } ?>" <?php if ($hesk_settings['detect_typos']) {
-                echo ' onblur="Javascript:hesk_suggestEmail(1)"';
-            } ?>
-                   placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"
-                   onkeyup="disableIfEmpty('email-input','notify-email')">
-        </div>
+                </div>
+                <div id="email_suggestions"></div>
+                <!-- Department and Priority -->
+                <?php
+                $has_error = '';
 
-    </div>
-    <div id="email_suggestions"></div>
-    <hr/>
-    <!-- Department and Priority -->
-    <?php if (in_array('category', $_SESSION['iserror'])) {
-        echo '<div class="form-group has-error">';
-    } elseif (in_array('category', $_SESSION['isnotice'])) {
-        echo '<div class="form-group has-warning">';
-    } else {
-        echo '<div class="form-group">';
-    } ?>
-    <label for="category" class="col-sm-3 control-label"><?php echo $hesklang['category']; ?><span
-            class="important">*</span></label>
-
-    <div class="col-sm-9">
-        <select name="category" class="form-control"
-            pattern="[0-9]+"
-            data-error="<?php echo htmlspecialchars($hesklang['sel_app_cat']); ?>"
-            required>
-            <?php
-            // Show the "Click to select"?
-            if ($hesk_settings['select_cat']) {
-                echo '<option value="">' . $hesklang['select'] . '</option>';
-            }
-
-            // List categories
-            $orderByColumn = $modsForHesk_settings['category_order_column'];
-            $result = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` WHERE `usage` <> 2 ORDER BY `' . $orderByColumn . '` ASC');
-            while ($row = hesk_dbFetchAssoc($result)) {
-                if (isset($_SESSION['as_category']) && $_SESSION['as_category'] == $row['id']) {
-                    $selected = ' selected="selected"';
-                } else {
-                    $selected = '';
+                if (in_array('category', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                } elseif (in_array('category', $_SESSION['isnotice'])) {
+                    $has_error = 'has-warning';
                 }
-                echo '<option value="' . $row['id'] . '"' . $selected . '>' . $row['name'] . '</option>';
-            }
-            ?>
-        </select>
-        <div class="help-block with-errors"></div>
-    </div>
-</div>
-<?php if (in_array('priority', $_SESSION['iserror'])) {
-    echo '<div class="form-group has-error">';
-} else {
-    echo '<div class="form-group">';
-} ?>
-<label for="priority" class="col-sm-3 control-label"><?php echo $hesklang['priority']; ?><span
-        class="important">*</span></label>
-<div class="col-sm-9">
-    <select name="priority" class="form-control"
-        pattern="[0-9]+"
-        data-error="<?php echo htmlspecialchars($hesklang['sel_app_priority']); ?>"
-        required>
-        <?php
-        // Show the "Click to select"?
-        if ($hesk_settings['select_pri']) {
-            echo '<option value="">' . $hesklang['select'] . '</option>';
-        }
-        ?>
-        <option value="3" <?php
-        if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 3)
-            || (isset($_GET['priority']) && $_GET['priority'] == 3)
-        ) {
-            echo 'selected="selected"';
-        } ?>><?php echo $hesklang['low']; ?></option>
-        <option value="2" <?php
-        if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 2)
-            || (isset($_GET['priority']) && $_GET['priority'] == 2)
-        ) {
-            echo 'selected="selected"';
-        } ?>><?php echo $hesklang['medium']; ?></option>
-        <option value="1" <?php
-        if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 1)
-            || (isset($_GET['priority']) && $_GET['priority'] == 1)
-        ) {
-            echo 'selected="selected"';
-        } ?>><?php echo $hesklang['high']; ?></option>
-        <option value="0" <?php
-        if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 0)
-            || (isset($_GET['priority']) && $_GET['priority'] == 0)
-        ) {
-            echo 'selected="selected"';
-        } ?>><?php echo $hesklang['critical']; ?></option>
-    </select>
-    <div class="help-block with-errors"></div>
-</div>
-</div>
-<!-- Start Custom Before -->
-<?php
-
-/* custom fields BEFORE comments */
-
-foreach ($hesk_settings['custom_fields'] as $k => $v) {
-    if ($v['use'] && $v['place'] == 0) {
-        if ($modsForHesk_settings['custom_field_setting']) {
-            $v['name'] = $hesklang[$v['name']];
-        }
-
-        // $v['req'] = $v['req'] ? '<font class="important">*</font>' : '';
-        // Staff doesn't need to fill in required custom fields
-        $v['req'] = '';
-
-        if ($v['type'] == 'checkbox' && !isset($_GET["c_$k"])) {
-            $k_value = array();
-            if (isset($_SESSION["c_$k"]) && is_array($_SESSION["c_$k"])) {
-                foreach ($_SESSION["c_$k"] as $myCB) {
-                    $k_value[] = stripslashes(hesk_input($myCB));
-                }
-            }
-        } elseif (isset($_SESSION["as_$k"])) {
-            $k_value = stripslashes(hesk_input($_SESSION["as_$k"]));
-        } elseif (isset($_GET["as_$k"])) {
-            if ($v['type'] == 'checkbox') {
-                $k_value = explode('-CHECKBOX-', $_GET["as_$k"]);
-            } else {
-                $k_value = stripslashes(hesk_GET("as_$k"));
-            }
-        } else {
-            $k_value = '';
-        }
-
-        switch ($v['type']) {
-            /* Radio box */
-            case 'radio':
-                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
-
-                $options = explode('#HESK#', $v['value']);
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                foreach ($options as $option) {
-
-                    if (strlen($k_value) == 0 || $k_value == $option) {
-                        $k_value = $option;
-                        $checked = 'checked="checked"';
-                    } else {
-                        $checked = '';
-                    }
-
-                    //Clean up multiple dashes or whitespaces
-                    $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                    $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                    echo '<label style="font-weight: normal;"><input type="radio" id="' . $formattedId . '" name="' . $k . '" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br />';
-                }
-
-                echo '</div></div>';
-                break;
-
-            /* Select drop-down box */
-            case 'select':
-
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] .  '</label>
-                                <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '" ' . $cls . '>';
-
-                // Show "Click to select"?
-                $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
-                if ($num) {
-                    echo '<option value="">' . $hesklang['select'] . '</option>';
-                }
-
-                $options = explode('#HESK#', $v['value']);
-
-                foreach ($options as $option) {
-
-                    if ($k_value == $option) {
-                        $k_value = $option;
-                        $selected = 'selected="selected"';
-                    } else {
-                        $selected = '';
-                    }
-
-                    echo '<option ' . $selected . '>' . $option . '</option>';
-                }
-
-                echo '</select></div></div>';
-                break;
-
-            case 'multiselect':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group"><label for="' . $v['name'] . '[]" class="col-sm-3 control-label">' . $v['name'] . '</label>
-                                <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '[]" ' . $cls . ' multiple>';
-
-                $options = explode('#HESK#', $v['value']);
-
-                foreach ($options as $option) {
-
-                    if (strlen($k_value == $option)) {
-                        $k_value = $option;
-                        $selected = 'selected="selected"';
-                    } else {
-                        $selected = '';
-                    }
-
-                    echo '<option ' . $selected . '>' . $option . '</option>';
-                }
-
-                echo '</select>
-                                <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\'' . $formattedId . '\')">'.$hesklang['select_all_title_case'].'</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\'' . $formattedId . '\')">'.$hesklang['deselect_all_title_case'].'</button>
-                                </div></div></div>';
-                break;
-
-            /* Checkbox */
-            case 'checkbox':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+                ?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="category" class="col-sm-3 control-label"><?php echo $hesklang['category']; ?><span
+                            class="important">*</span></label>
+
+                    <div class="col-sm-9">
+                        <select name="category" class="form-control"
+                                pattern="[0-9]+"
+                                data-error="<?php echo htmlspecialchars($hesklang['sel_app_cat']); ?>"
+                                required>
+                            <?php
+                            // Show the "Click to select"?
+                            if ($hesk_settings['select_cat']) {
+                                echo '<option value="">' . $hesklang['select'] . '</option>';
+                            }
+                            // List categories
+                            $orderByColumn = $modsForHesk_settings['category_order_column'];
+                            $result = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` WHERE `usage` <> 2 ORDER BY `' . $orderByColumn . '` ASC');
+                            while ($row = hesk_dbFetchAssoc($result)) {
+                                if (isset($_SESSION['as_category']) && $_SESSION['as_category'] == $row['id']) {
+                                    $selected = ' selected="selected"';
+                                } else {
+                                    $selected = '';
+                                }
+                                echo '<option value="' . $row['id'] . '"' . $selected . '>' . $row['name'] . '</option>';
+                            }
+                            ?>
+                        </select>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
+                <?php
+                $has_error = '';
+                if (in_array('priority', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                } ?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="priority" class="col-sm-3 control-label"><?php echo $hesklang['priority']; ?><span
+                            class="important">*</span></label>
+                    <div class="col-sm-9">
+                        <select name="priority" class="form-control"
+                                pattern="[0-9]+"
+                                data-error="<?php echo htmlspecialchars($hesklang['sel_app_priority']); ?>"
+                                required>
+                            <?php
+                            // Show the "Click to select"?
+                            if ($hesk_settings['select_pri']) {
+                                echo '<option value="">' . $hesklang['select'] . '</option>';
+                            }
+                            ?>
+                            <option value="3" <?php
+                            if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 3)
+                                || (isset($_GET['priority']) && $_GET['priority'] == 3)
+                            ) {
+                                echo 'selected="selected"';
+                            } ?>><?php echo $hesklang['low']; ?></option>
+                            <option value="2" <?php
+                            if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 2)
+                                || (isset($_GET['priority']) && $_GET['priority'] == 2)
+                            ) {
+                                echo 'selected="selected"';
+                            } ?>><?php echo $hesklang['medium']; ?></option>
+                            <option value="1" <?php
+                            if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 1)
+                                || (isset($_GET['priority']) && $_GET['priority'] == 1)
+                            ) {
+                                echo 'selected="selected"';
+                            } ?>><?php echo $hesklang['high']; ?></option>
+                            <option value="0" <?php
+                            if ((isset($_SESSION['as_priority']) && $_SESSION['as_priority'] == 0)
+                                || (isset($_GET['priority']) && $_GET['priority'] == 0)
+                            ) {
+                                echo 'selected="selected"';
+                            } ?>><?php echo $hesklang['critical']; ?></option>
+                        </select>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
+                <?php
+                /* custom fields BEFORE comments */
+                foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                    if ($v['use'] && $v['place'] == 0) {
+                        if ($modsForHesk_settings['custom_field_setting']) {
+                            $v['name'] = $hesklang[$v['name']];
+                        }
+
+                        // $v['req'] = $v['req'] ? '<font class="important">*</font>' : '';
+                        // Staff doesn't need to fill in required custom fields
+                        $v['req'] = '';
+
+                        if ($v['type'] == 'checkbox' && !isset($_GET["c_$k"])) {
+                            $k_value = array();
+                            if (isset($_SESSION["c_$k"]) && is_array($_SESSION["c_$k"])) {
+                                foreach ($_SESSION["c_$k"] as $myCB) {
+                                    $k_value[] = stripslashes(hesk_input($myCB));
+                                }
+                            }
+                        } elseif (isset($_SESSION["as_$k"])) {
+                            $k_value = stripslashes(hesk_input($_SESSION["as_$k"]));
+                        } elseif (isset($_GET["as_$k"])) {
+                            if ($v['type'] == 'checkbox') {
+                                $k_value = explode('-CHECKBOX-', $_GET["as_$k"]);
+                            } else {
+                                $k_value = stripslashes(hesk_GET("as_$k"));
+                            }
+                        } else {
+                            $k_value = '';
+                        }
+
+                        switch ($v['type']) {
+                            /* Radio box */
+                            case 'radio':
+                                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
+
+                                $options = explode('#HESK#', $v['value']);
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                foreach ($options as $option) {
+
+                                    if (strlen($k_value) == 0 || $k_value == $option) {
+                                        $k_value = $option;
+                                        $checked = 'checked="checked"';
+                                    } else {
+                                        $checked = '';
+                                    }
+
+                                    //Clean up multiple dashes or whitespaces
+                                    $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                    $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                    echo '<label style="font-weight: normal;"><input type="radio" id="' . $formattedId . '" name="' . $k . '" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br>';
+                                }
+
+                                echo '</div></div>';
+                                break;
+
+                            /* Select drop-down box */
+                            case 'select':
+
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] .  '</label>
+                        <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '" ' . $cls . '>';
+
+                                // Show "Click to select"?
+                                $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
+                                if ($num) {
+                                    echo '<option value="">' . $hesklang['select'] . '</option>';
+                                }
+
+                                $options = explode('#HESK#', $v['value']);
+
+                                foreach ($options as $option) {
+
+                                    if ($k_value == $option) {
+                                        $k_value = $option;
+                                        $selected = 'selected="selected"';
+                                    } else {
+                                        $selected = '';
+                                    }
+
+                                    echo '<option ' . $selected . '>' . $option . '</option>';
+                                }
+
+                                echo '</select></div></div>';
+                                break;
+
+                            case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group"><label for="' . $v['name'] . '[]" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '[]" ' . $cls . ' multiple>';
+
+                                $options = explode('#HESK#', $v['value']);
+
+                                foreach ($options as $option) {
+
+                                    if (strlen($k_value == $option)) {
+                                        $k_value = $option;
+                                        $selected = 'selected="selected"';
+                                    } else {
+                                        $selected = '';
+                                    }
+
+                                    echo '<option ' . $selected . '>' . $option . '</option>';
+                                }
+
+                                echo '</select>
+                        <div class="btn-group" role="group">
+                            <button type="button" class="btn btn-default" onclick="selectAll(\'' . $formattedId . '\')">'.$hesklang['select_all_title_case'].'</button>
+                            <button type="button" class="btn btn-default" onclick="deselectAll(\'' . $formattedId . '\')">'.$hesklang['deselect_all_title_case'].'</button>
+                        </div></div></div>';
+                                break;
+
+                            /* Checkbox */
+                            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
 
-                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
-                $options = explode('#HESK#', $v['value']);
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+                                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
+                                $options = explode('#HESK#', $v['value']);
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
 
-                foreach ($options as $option) {
+                                foreach ($options as $option) {
 
-                    if (in_array($option, $k_value)) {
-                        $checked = 'checked="checked"';
-                    } else {
-                        $checked = '';
-                    }
+                                    if (in_array($option, $k_value)) {
+                                        $checked = 'checked="checked"';
+                                    } else {
+                                        $checked = '';
+                                    }
 
-                    echo '<label style="font-weight: normal;"><input id="' . $formattedId . '" type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br />';
-                }
-                echo '</div></div>';
-                break;
+                                    echo '<label style="font-weight: normal;"><input id="' . $formattedId . '" type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br>';
+                                }
+                                echo '</div></div>';
+                                break;
 
-            /* Large text box */
-            case 'textarea':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+                            /* Large text box */
+                            case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
 
-                $size = explode('#', $v['value']);
-                $size[0] = empty($size[0]) ? 5 : intval($size[0]);
-                $size[1] = empty($size[1]) ? 30 : intval($size[1]);
+                                $size = explode('#', $v['value']);
+                                $size[0] = empty($size[0]) ? 5 : intval($size[0]);
+                                $size[1] = empty($size[1]) ? 30 : intval($size[1]);
 
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
 
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><textarea class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" rows="' . $size[0] . '" cols="' . $size[1] . '" ' . $cls . '>' . $k_value . '</textarea></div>
-                                </div>';
-                break;
-
-            case 'date':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' isError ' : '';
-
-                echo '
-                                <div class="form-group">
-                                    <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-                                    <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly ' . $cls . '" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40"
-                                            maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" readonly/>
-                                        <span class="help-block">' . $hesklang['date_format'] . '</span>
-                                    </div>
-                                </div>';
-                break;
-
-            case 'email':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                if ($v['value'] == 'cc' || $v['value'] == 'bcc') {
-                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
-                    $v['value'] = '';
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
-                                </div>';
-
-                break;
-
-            case 'hidden':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' />';
-
-                break;
-
-            case 'readonly':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' readonly></div>
-                                </div>';
-
-                break;
-
-            /* Default text input */
-            default:
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
-                                </div>';
-        }
-    }
-}
-?>
-<!-- End custom before -->
-<!-- Ticket Info -->
-<?php
-// Lets handle ticket templates
-$can_options = '';
-
-// Get ticket templates from the database
-$res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` ORDER BY `tpl_order` ASC");
-
-// If we have any templates print them out
-if (hesk_dbNumRows($res)) {
-    ?>
-    <script language="javascript" type="text/javascript"><!--
-        // -->
-        var myMsgTxt = new Array();
-        var mySubjectTxt = new Array();
-        myMsgTxt[0] = '';
-        mySubjectTxt[0] = '';
-
-        <?php
-        while ($mysaved = hesk_dbFetchRow($res))
-        {
-            $can_options .= '<option value="' . $mysaved[0] . '">' . $mysaved[1]. "</option>\n";
-            if ($modsForHesk_settings['rich_text_for_tickets']) {
-                $theMessage = hesk_html_entity_decode($mysaved[2]);
-                $theMessage = addslashes($theMessage);
-                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
-            } else {
-                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[2]))."';\n";
-            }
-            echo 'mySubjectTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[1]))."';\n";
-        }
-
-        ?>
-
-        function setMessage(msgid) {
-            var useHtmlEditor = <?php echo $modsForHesk_settings['rich_text_for_tickets']; ?>;
-            var myMsg = myMsgTxt[msgid];
-            var mySubject = mySubjectTxt[msgid];
-
-            if (myMsg == '') {
-                if (document.form1.mode[1].checked) {
-                    if (useHtmlEditor) {
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
-                    }
-                    else {
-                        $('#message').val('');
-                    }
-                    $('#subject').val('');
-                }
-                return true;
-            }
-            if (document.getElementById) {
-                if (document.getElementById('moderep').checked) {
-                    if (useHtmlEditor) {
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
-                    } else {
-                        myMsg = $('<textarea />').html(myMsg).text();
-                        $('#message').val(myMsg).trigger('input');
-                    }
-                    mySubject = $('<textarea />').html(mySubject).text();
-                    $('#subject').val(mySubject).trigger('input');
-                }
-                else {
-                    if (useHtmlEditor) {
-                        var oldMsg = tinymce.get("message").getContent();
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
-                    } else {
-                        var oldMsg = document.getElementById('message').value;
-                        var theMsg = $('<textarea />').html(oldMsg + myMsg).text();
-                        $('#message').val(theMsg).trigger('input');
-                    }
-                    if (document.getElementById('subject').value == '') {
-                        mySubject = $('<textarea />').html(mySubject).text();
-                        $('#subject').val(mySubject).trigger('input');
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><textarea class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" rows="' . $size[0] . '" cols="' . $size[1] . '" ' . $cls . '>' . $k_value . '</textarea></div>
+                        </div>';
+                                break;
+
+                            case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' isError ' : '';
+
+                                echo '
+                        <div class="form-group">
+                            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="datepicker form-control white-readonly ' . $cls . '" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40"
+                                    maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" readonly/>
+                                <span class="help-block">' . $hesklang['date_format'] . '</span>
+                            </div>
+                        </div>';
+                                break;
+
+                            case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                if ($v['value'] == 'cc' || $v['value'] == 'bcc') {
+                                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
+                                    $v['value'] = '';
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
+                        </div>';
+
+                                break;
+
+                            case 'hidden':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' />';
+
+                                break;
+
+                            case 'readonly':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' readonly></div>
+                        </div>';
+
+                                break;
+
+                            /* Default text input */
+                            default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
+                        </div>';
+                        }
                     }
                 }
-            }
-            else {
-                if (document.form1.mode[0].checked) {
-                    document.form1.message.value = myMsg;
-                    document.form1.subject.value = mySubject;
+
+                // Lets handle ticket templates
+                $can_options = '';
+
+                // Get ticket templates from the database
+                $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` ORDER BY `tpl_order` ASC");
+
+                // If we have any templates print them out
+                if (hesk_dbNumRows($res)) {
+                    ?>
+                    <script language="javascript" type="text/javascript"><!--
+                        // -->
+                        var myMsgTxt = new Array();
+                        var mySubjectTxt = new Array();
+                        myMsgTxt[0] = '';
+                        mySubjectTxt[0] = '';
+
+                        <?php
+                        while ($mysaved = hesk_dbFetchRow($res))
+                        {
+                            $can_options .= '<option value="' . $mysaved[0] . '">' . $mysaved[1]. "</option>\n";
+                            if ($modsForHesk_settings['rich_text_for_tickets']) {
+                                $theMessage = hesk_html_entity_decode($mysaved[2]);
+                                $theMessage = addslashes($theMessage);
+                                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
+                            } else {
+                                echo 'myMsgTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[2]))."';\n";
+                            }
+                            echo 'mySubjectTxt['.$mysaved[0].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved[1]))."';\n";
+                        }
+
+                        ?>
+
+                        function setMessage(msgid) {
+                            var useHtmlEditor = <?php echo $modsForHesk_settings['rich_text_for_tickets']; ?>;
+                            var myMsg = myMsgTxt[msgid];
+                            var mySubject = mySubjectTxt[msgid];
+
+                            if (myMsg == '') {
+                                if (document.form1.mode[1].checked) {
+                                    if (useHtmlEditor) {
+                                        tinymce.get("message").setContent('');
+                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                                    }
+                                    else {
+                                        $('#message').val('');
+                                    }
+                                    $('#subject').val('');
+                                }
+                                return true;
+                            }
+                            if (document.getElementById) {
+                                if (document.getElementById('moderep').checked) {
+                                    if (useHtmlEditor) {
+                                        tinymce.get("message").setContent('');
+                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                                    } else {
+                                        myMsg = $('<textarea />').html(myMsg).text();
+                                        $('#message').val(myMsg).trigger('input');
+                                    }
+                                    mySubject = $('<textarea />').html(mySubject).text();
+                                    $('#subject').val(mySubject).trigger('input');
+                                }
+                                else {
+                                    if (useHtmlEditor) {
+                                        var oldMsg = tinymce.get("message").getContent();
+                                        tinymce.get("message").setContent('');
+                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
+                                    } else {
+                                        var oldMsg = document.getElementById('message').value;
+                                        var theMsg = $('<textarea />').html(oldMsg + myMsg).text();
+                                        $('#message').val(theMsg).trigger('input');
+                                    }
+                                    if (document.getElementById('subject').value == '') {
+                                        mySubject = $('<textarea />').html(mySubject).text();
+                                        $('#subject').val(mySubject).trigger('input');
+                                    }
+                                }
+                            }
+                            else {
+                                if (document.form1.mode[0].checked) {
+                                    document.form1.message.value = myMsg;
+                                    document.form1.subject.value = mySubject;
+                                }
+                                else {
+                                    var oldMsg = document.form1.message.value;
+                                    document.form1.message.value = oldMsg + myMsg;
+                                    if (document.form1.subject.value == '') {
+                                        document.form1.subject.value = mySubject;
+                                    }
+                                }
+                            }
+
+                        }
+                        //-->
+                    </script>
+                    <?php
+                } // END fetchrows
+
+                // Print templates
+                if (strlen($can_options)) {
+                    ?>
+                    <div class="form-group">
+                        <label for="modeadd" class="col-sm-3 control-label"><?php echo $hesklang['ticket_tpl']; ?></label>
+
+                        <div class="col-sm-9">
+                            <div class="radio">
+                                <label><input type="radio" name="mode" id="modeadd" value="1"
+                                              checked="checked"> <?php echo $hesklang['madd']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="mode" id="moderep" value="0"/> <?php echo $hesklang['mrep']; ?></label>
+                            </div>
+                            <?php echo hesk_checkPermission('can_man_ticket_tpl', 0) ? '(<a href="manage_ticket_templates.php">' . $hesklang['ticket_tpl_man'] . '</a>)' : ''; ?>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="saved_replies" class="col-sm-3 control-label"><?php echo $hesklang['select_ticket_tpl']; ?></label>
+
+                        <div class="col-sm-9">
+                            <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
+                                <option value="0"> - <?php echo $hesklang['select_empty']; ?> -</option>
+                                <?php echo $can_options; ?>
+                            </select>
+                        </div>
+                    </div>
+                    <?php
+                } // END printing templates
+                elseif (hesk_checkPermission('can_man_ticket_tpl', 0)) {
+                    ?>
+                    <div class="form-group">
+                        <div class="col-sm-9 col-sm-offset-3">
+                            <a href="manage_ticket_templates.php"><?php echo $hesklang['ticket_tpl_man']; ?></a>
+                        </div>
+                    </div>
+                    <?php
                 }
-                else {
-                    var oldMsg = document.form1.message.value;
-                    document.form1.message.value = oldMsg + myMsg;
-                    if (document.form1.subject.value == '') {
-                        document.form1.subject.value = mySubject;
+                ?>
+                <div class="form-group">
+                    <label for="due-date" class="col-sm-3 control-label"><?php echo $hesklang['due_date']; ?></label>
+                    <div class="col-sm-9">
+                        <input class="form-control datepicker" name="due-date" placeholder="<?php echo htmlspecialchars($hesklang['due_date']); ?>"
+                               value="<?php if (isset($_GET['due_date'])) { echo $_GET['due_date']; } ?>">
+                        <span class="help-block"><?php echo $hesklang['date_format']; ?></span>
+                    </div>
+                </div>
+                <?php
+                $has_error = '';
+                if (in_array('subject', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                }?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject']; ?><span
+                            class="important">*</span></label>
+                    <div class="col-sm-9">
+                        <span id="HeskSub"><input class="form-control" type="text" name="subject" id="subject" size="40" maxlength="40"
+                          value="<?php if (isset($_SESSION['as_subject']) || isset($_GET['subject'])) {
+                              echo stripslashes(hesk_input($_SESSION['as_subject']));
+                          } ?>" placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"
+                          data-error="<?php echo htmlspecialchars($hesklang['enter_subject']); ?>"
+                          required></span>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
+                <?php
+                $has_error = '';
+                if (in_array('message', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                } ?>
+                <div class="form-group <?php echo $has_error; ?>" id="message-group">
+                    <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?><span
+                            class="important">*</span></label>
+                    <div class="col-sm-9">
+                    <span id="HeskMsg">
+                        <textarea class="form-control htmlEditor" name="message" id="message" rows="12" cols="60"
+                                  placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>"
+                                  data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>"
+                                  required><?php if (isset($_SESSION['as_message'])) {
+                                echo stripslashes(hesk_input($_SESSION['as_message']));
+                            } ?></textarea>
+                    </span>
+                        <div class="help-block with-errors" id="message-help-block"></div>
+                    </div>
+                </div>
+                <?php
+
+                /* custom fields AFTER comments */
+
+                foreach ($hesk_settings['custom_fields'] as $k => $v) {
+                    if ($v['use'] && $v['place']) {
+                        if ($modsForHesk_settings['custom_field_setting']) {
+                            $v['name'] = $hesklang[$v['name']];
+                        }
+
+                        // $v['req'] = $v['req'] ? '<font class="important">*</font>' : '';
+                        // Staff doesn't need to fill in required custom fields
+                        $v['req'] = '';
+
+                        if ($v['type'] == 'checkbox') {
+                            $k_value = array();
+                            if (isset($_SESSION["c_$k"]) && is_array($_SESSION["c_$k"])) {
+                                foreach ($_SESSION["c_$k"] as $myCB) {
+                                    $k_value[] = stripslashes(hesk_input($myCB));
+                                }
+                            }
+                        } elseif (isset($_SESSION["c_$k"])) {
+                            $k_value = stripslashes(hesk_input($_SESSION["c_$k"]));
+                        } else {
+                            $k_value = '';
+                        }
+
+                        switch ($v['type']) {
+                            /* Radio box */
+                            case 'radio':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
+
+                                $options = explode('#HESK#', $v['value']);
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                foreach ($options as $option) {
+
+                                    if (strlen($k_value) == 0 || $k_value == $option) {
+                                        $k_value = $option;
+                                        $checked = 'checked="checked"';
+                                    } else {
+                                        $checked = '';
+                                    }
+
+                                    echo '<label style="font-weight: normal;"><input type="radio" id="' . $formattedId . '" name="' . $k . '" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br>';
+                                }
+
+                                echo '</div></div>';
+                                break;
+
+                            /* Select drop-down box */
+                            case 'select':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '" ' . $cls . '>';
+
+                                // Show "Click to select"?
+                                $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
+                                if ($num) {
+                                    echo '<option value="">' . $hesklang['select'] . '</option>';
+                                }
+
+                                $options = explode('#HESK#', $v['value']);
+
+                                foreach ($options as $option) {
+
+                                    if ($k_value == $option) {
+                                        $k_value = $option;
+                                        $selected = 'selected="selected"';
+                                    } else {
+                                        $selected = '';
+                                    }
+
+                                    echo '<option ' . $selected . '>' . $option . '</option>';
+                                }
+
+                                echo '</select></div></div>';
+                                break;
+
+                            /* Checkbox */
+                            case 'checkbox':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
+
+                                $options = explode('#HESK#', $v['value']);
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                foreach ($options as $option) {
+
+                                    if (in_array($option, $k_value)) {
+                                        $checked = 'checked="checked"';
+                                    } else {
+                                        $checked = '';
+                                    }
+
+                                    echo '<label style="font-weight: normal;"><input id="' . $formattedId . '" type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br>';
+                                }
+                                echo '</div></div>';
+                                break;
+
+                            /* Large text box */
+                            case 'textarea':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                $size = explode('#', $v['value']);
+                                $size[0] = empty($size[0]) ? 5 : intval($size[0]);
+                                $size[1] = empty($size[1]) ? 30 : intval($size[1]);
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><textarea class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" rows="' . $size[0] . '" cols="' . $size[1] . '" ' . $cls . '>' . $k_value . '</textarea></div>
+                        </div>';
+                                break;
+
+                            case 'date':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' isError ' : '';
+
+                                echo '
+                        <div class="form-group">
+                            <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="datepicker form-control white-readonly ' . $cls . '" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40"
+                                    maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" readonly/>
+                                <span class="help-block">' . $hesklang['date_format'] . '</span>
+                            </div>
+                        </div>';
+                                break;
+
+                            case 'multiselect':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group"><label for="' . $v['name'] . '[]" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '[]" ' . $cls . ' multiple>';
+
+                                $options = explode('#HESK#', $v['value']);
+
+                                foreach ($options as $option) {
+
+                                    if ($k_value == $option) {
+                                        $k_value = $option;
+                                        $selected = 'selected="selected"';
+                                    } else {
+                                        $selected = '';
+                                    }
+
+                                    echo '<option ' . $selected . '>' . $option . '</option>';
+                                }
+
+                                echo '</select>
+                        <div class="btn-group" role="group">
+                            <button type="button" class="btn btn-default" onclick="selectAll(\'' . $formattedId . '\')">'.$hesklang['select_all_title_case'].'</button>
+                            <button type="button" class="btn btn-default" onclick="deselectAll(\'' . $formattedId . '\')">'.$hesklang['deselect_all_title_case'].'</button>
+                        </div></div></div>';
+                                break;
+
+                            case 'email':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                if ($v['value'] == 'cc' || $v['value'] == 'bcc') {
+                                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
+                                    $v['value'] = '';
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
+                        </div>';
+
+                                break;
+
+                            case 'hidden':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' />';
+
+                                break;
+
+                            case 'readonly':
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' readonly></div>
+                        </div>';
+
+                                break;
+
+                            /* Default text input */
+                            default:
+                                //Clean up multiple dashes or whitespaces
+                                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
+                                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
+
+                                if (strlen($k_value) != 0) {
+                                    $v['value'] = $k_value;
+                                }
+
+                                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
+
+                                echo '<div class="form-group">
+                        <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
+                        <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
+                        </div>';
+                        }
                     }
                 }
-            }
+                /* end custom after */
+                /* attachments */
+                if ($hesk_settings['attachments']['use']) {
 
-        }
-        //-->
-    </script>
-    <?php
-} // END fetchrows
+                    ?>
+                    <div class="form-group">
+                        <label for="attachments" class="control-label col-sm-3"><?php echo $hesklang['attachments']; ?>:</label>
 
-// Print templates
-if (strlen($can_options)) {
-    ?>
-    <div class="form-group">
-        <label for="modeadd" class="col-sm-3 control-label"><?php echo $hesklang['ticket_tpl']; ?></label>
+                        <div class="col-sm-9">
+                            <?php build_dropzone_markup(true); ?>
+                        </div>
+                    </div>
+                    <?php
+                    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+                }
 
-        <div class="col-sm-9">
-            <div class="radio">
-                <label><input type="radio" name="mode" id="modeadd" value="1"
-                              checked="checked"> <?php echo $hesklang['madd']; ?></label>
-            </div>
-            <div class="radio">
-                <label><input type="radio" name="mode" id="moderep" value="0"/> <?php echo $hesklang['mrep']; ?></label>
-            </div>
-            <?php echo hesk_checkPermission('can_man_ticket_tpl', 0) ? '(<a href="manage_ticket_templates.php">' . $hesklang['ticket_tpl_man'] . '</a>)' : ''; ?>
+                if (!isset($_SESSION['as_notify'])) {
+                    $_SESSION['as_notify'] = $_SESSION['notify_customer_new'] ? 1 : 0;
+                }
+                ?>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label"><?php echo $hesklang['addop']; ?>:</label>
+
+                    <div class="col-sm-9">
+                        <label><input type="checkbox" id="notify-email" name="notify"
+                                      value="1" <?php echo empty($_SESSION['as_notify']) ? '' : 'checked="checked"'; ?> /> <?php echo $hesklang['seno']; ?>
+                        </label><br>
+                        <label><input type="checkbox" name="show"
+                                      value="1" <?php echo (!isset($_SESSION['as_show']) || !empty($_SESSION['as_show'])) ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['otas']; ?>
+                        </label>
+                    </div>
+                </div>
+                <?php
+                if (hesk_checkPermission('can_assign_others',0))
+                {
+                    $has_error = '';
+                    if (in_array('owner',$_SESSION['iserror'])) {
+                        $has_error = 'has-error';
+                    }
+                    ?>
+                    <div class="form-group <?php echo $has_error; ?>">
+                        <label for="owner" class="col-sm-3 control-label"><?php echo $hesklang['asst2']; ?>:</label>
+                        <div class="col-sm-9">
+                            <select class="form-control" name="owner" >
+                                <option value="-1"> &gt; <?php echo $hesklang['unas']; ?> &lt; </option>
+                                <?php
+
+                                if ($hesk_settings['autoassign'])
+                                {
+                                    echo '<option value="-2"> &gt; ' . $hesklang['aass'] . ' &lt; </option>';
+                                }
+
+                                $owner = isset($_SESSION['as_owner']) ? intval($_SESSION['as_owner']) : 0;
+
+                                foreach ($admins as $k=>$v)
+                                {
+                                    if ($k == $owner)
+                                    {
+                                        echo '<option value="'.$k.'" selected="selected">'.$v.'</option>';
+                                    }
+                                    else
+                                    {
+                                        echo '<option value="'.$k.'">'.$v.'</option>';
+                                    }
+
+                                }
+                                ?>
+                            </select>
+                        </div>
+                    </div>
+                    <?php
+                }
+                elseif (hesk_checkPermission('can_assign_self',0))
+                {
+                    $checked = (!isset($_SESSION['as_owner']) || !empty($_SESSION['as_owner'])) ? 'checked="checked"' : '';
+                    ?>
+                    <div class="form-group">
+                        <div class="col-sm-9 col-sm-offset-3">
+                            <label><input type="checkbox" name="assing_to_self" value="1" <?php echo $checked; ?> /> <?php echo $hesklang['asss2']; ?></label>
+                        </div>
+                    </div>
+                    <?php
+                }
+
+                if ($modsForHesk_settings['request_location']):
+                    ?>
+                    <div class="form-group">
+                        <label for="location" class="col-md-3 control-label"><?php echo $hesklang['location_colon']; ?></label>
+
+                        <div class="col-sm-9">
+                            <p id="console"><?php echo $hesklang['requesting_location_ellipsis']; ?></p>
+
+                            <div id="map" style="height: 300px; display:none">
+                            </div>
+                        </div>
+                    </div>
+                <?php endif; ?>
+                <!-- Submit -->
+                <div class="form-group">
+                    <div class="col-sm-9 col-sm-offset-3">
+                        <input type="hidden" id="latitude" name="latitude" value="E-0">
+                        <input type="hidden" id="longitude" name="longitude" value="E-0">
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
+                        <input type="submit" value="<?php echo $hesklang['sub_ticket']; ?>" class="btn btn-default">
+                    </div>
+                </div>
+            </form>
         </div>
     </div>
-    <div class="form-group">
-        <label for="saved_replies" class="col-sm-3 control-label"><?php echo $hesklang['select_ticket_tpl']; ?></label>
+</section>
 
-        <div class="col-sm-9">
-            <select class="form-control" name="saved_replies" onchange="setMessage(this.value)">
-                <option value="0"> - <?php echo $hesklang['select_empty']; ?> -</option>
-                <?php echo $can_options; ?>
-            </select>
-        </div>
-    </div>
-    <?php
-} // END printing templates
-elseif (hesk_checkPermission('can_man_ticket_tpl', 0)) {
-    ?>
-    <div class="form-group">
-        <div class="col-sm-9 col-sm-offset-3">
-            <a href="manage_ticket_templates.php"><?php echo $hesklang['ticket_tpl_man']; ?></a>
-        </div>
-    </div>
-    <?php
-}
-?>
-
-<div class="form-group">
-    <label for="due-date" class="col-sm-3 control-label"><?php echo $hesklang['due_date']; ?></label>
-    <div class="col-sm-9">
-        <input class="form-control datepicker" name="due-date" placeholder="<?php echo htmlspecialchars($hesklang['due_date']); ?>"
-            value="<?php if (isset($_GET['due_date'])) { echo $_GET['due_date']; } ?>">
-        <span class="help-block"><?php echo $hesklang['date_format']; ?></span>
-    </div>
-</div>
-
-<?php if (in_array('subject', $_SESSION['iserror'])) {
-    echo '<div class="form-group has-error">';
-} else {
-    echo '<div class="form-group">';
-} ?>
-<label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject']; ?><span
-        class="important">*</span></label>
-<div class="col-sm-9">
-    <span id="HeskSub"><input class="form-control" type="text" name="subject" id="subject" size="40" maxlength="40"
-                              value="<?php if (isset($_SESSION['as_subject']) || isset($_GET['subject'])) {
-                                  echo stripslashes(hesk_input($_SESSION['as_subject']));
-                              } ?>" placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"
-                                data-error="<?php echo htmlspecialchars($hesklang['enter_subject']); ?>"
-            required></span>
-    <div class="help-block with-errors"></div>
-</div>
-</div>
-<?php if (in_array('message', $_SESSION['iserror'])) {
-    echo '<div class="form-group has-error" id="message-group">';
-} else {
-    echo '<div class="form-group" id="message-group">';
-} ?>
-<label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?><span
-        class="important">*</span></label>
-<div class="col-sm-9">
-                        <span id="HeskMsg">
-                            <textarea class="form-control htmlEditor" name="message" id="message" rows="12" cols="60"
-                                      placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>"
-                                      data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>"
-                                      required><?php if (isset($_SESSION['as_message'])) {
-                                    echo stripslashes(hesk_input($_SESSION['as_message']));
-                                } ?></textarea>
-                        </span>
-    <div class="help-block with-errors" id="message-help-block"></div>
-</div>
-</div>
-<hr/>
-<!-- Custom After -->
-<?php
-
-/* custom fields AFTER comments */
-
-foreach ($hesk_settings['custom_fields'] as $k => $v) {
-    if ($v['use'] && $v['place']) {
-        if ($modsForHesk_settings['custom_field_setting']) {
-            $v['name'] = $hesklang[$v['name']];
-        }
-
-        // $v['req'] = $v['req'] ? '<font class="important">*</font>' : '';
-        // Staff doesn't need to fill in required custom fields
-        $v['req'] = '';
-
-        if ($v['type'] == 'checkbox') {
-            $k_value = array();
-            if (isset($_SESSION["c_$k"]) && is_array($_SESSION["c_$k"])) {
-                foreach ($_SESSION["c_$k"] as $myCB) {
-                    $k_value[] = stripslashes(hesk_input($myCB));
-                }
-            }
-        } elseif (isset($_SESSION["c_$k"])) {
-            $k_value = stripslashes(hesk_input($_SESSION["c_$k"]));
-        } else {
-            $k_value = '';
-        }
-
-        switch ($v['type']) {
-            /* Radio box */
-            case 'radio':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
-
-                $options = explode('#HESK#', $v['value']);
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                foreach ($options as $option) {
-
-                    if (strlen($k_value) == 0 || $k_value == $option) {
-                        $k_value = $option;
-                        $checked = 'checked="checked"';
-                    } else {
-                        $checked = '';
-                    }
-
-                    echo '<label style="font-weight: normal;"><input type="radio" id="' . $formattedId . '" name="' . $k . '" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br />';
-                }
-
-                echo '</div></div>';
-                break;
-
-            /* Select drop-down box */
-            case 'select':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group"><label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-                                <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '" ' . $cls . '>';
-
-                // Show "Click to select"?
-                $v['value'] = str_replace('{HESK_SELECT}', '', $v['value'], $num);
-                if ($num) {
-                    echo '<option value="">' . $hesklang['select'] . '</option>';
-                }
-
-                $options = explode('#HESK#', $v['value']);
-
-                foreach ($options as $option) {
-
-                    if ($k_value == $option) {
-                        $k_value = $option;
-                        $selected = 'selected="selected"';
-                    } else {
-                        $selected = '';
-                    }
-
-                    echo '<option ' . $selected . '>' . $option . '</option>';
-                }
-
-                echo '</select></div></div>';
-                break;
-
-            /* Checkbox */
-            case 'checkbox':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                echo '<div class="form-group"><label class="col-sm-3 control-label">' . $v['name'] . '</label><div align="left" class="col-sm-9">';
-
-                $options = explode('#HESK#', $v['value']);
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                foreach ($options as $option) {
-
-                    if (in_array($option, $k_value)) {
-                        $checked = 'checked="checked"';
-                    } else {
-                        $checked = '';
-                    }
-
-                    echo '<label style="font-weight: normal;"><input id="' . $formattedId . '" type="checkbox" name="' . $k . '[]" value="' . $option . '" ' . $checked . ' ' . $cls . ' /> ' . $option . '</label><br />';
-                }
-                echo '</div></div>';
-                break;
-
-            /* Large text box */
-            case 'textarea':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                $size = explode('#', $v['value']);
-                $size[0] = empty($size[0]) ? 5 : intval($size[0]);
-                $size[1] = empty($size[1]) ? 30 : intval($size[1]);
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><textarea class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" rows="' . $size[0] . '" cols="' . $size[1] . '" ' . $cls . '>' . $k_value . '</textarea></div>
-                                </div>';
-                break;
-
-            case 'date':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' isError ' : '';
-
-                echo '
-                                <div class="form-group">
-                                    <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-                                    <div class="col-sm-9">
-                                        <input type="text" class="datepicker form-control white-readonly ' . $cls . '" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40"
-                                            maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" readonly/>
-                                        <span class="help-block">' . $hesklang['date_format'] . '</span>
-                                    </div>
-                                </div>';
-                break;
-
-            case 'multiselect':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group"><label for="' . $v['name'] . '[]" class="col-sm-3 control-label">' . $v['name'] . '</label>
-                                <div class="col-sm-9"><select class="form-control" id="' . $formattedId . '" name="' . $k . '[]" ' . $cls . ' multiple>';
-
-                $options = explode('#HESK#', $v['value']);
-
-                foreach ($options as $option) {
-
-                    if ($k_value == $option) {
-                        $k_value = $option;
-                        $selected = 'selected="selected"';
-                    } else {
-                        $selected = '';
-                    }
-
-                    echo '<option ' . $selected . '>' . $option . '</option>';
-                }
-
-                echo '</select>
-                                <div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-default" onclick="selectAll(\'' . $formattedId . '\')">'.$hesklang['select_all_title_case'].'</button>
-                                    <button type="button" class="btn btn-default" onclick="deselectAll(\'' . $formattedId . '\')">'.$hesklang['deselect_all_title_case'].'</button>
-                                </div></div></div>';
-                break;
-
-            case 'email':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                if ($v['value'] == 'cc' || $v['value'] == 'bcc') {
-                    // (b)cc isn't a valid email but is the "value" used by settings. Just remove it.
-                    $v['value'] = '';
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
-                                </div>';
-
-                break;
-
-            case 'hidden':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<input type="hidden" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' />';
-
-                break;
-
-            case 'readonly':
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $formattedId);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' readonly></div>
-                                </div>';
-
-                break;
-
-            /* Default text input */
-            default:
-                //Clean up multiple dashes or whitespaces
-                $formattedId = preg_replace("/[\s-]+/", " ", $v['name']);
-                $formattedId = preg_replace("/[\s_]/", "-", $v['name']);
-
-                if (strlen($k_value) != 0) {
-                    $v['value'] = $k_value;
-                }
-
-                $cls = in_array($k, $_SESSION['iserror']) ? ' class="isError" ' : '';
-
-                echo '<div class="form-group">
-                                <label for="' . $v['name'] . '" class="col-sm-3 control-label">' . $v['name'] . '</label>
-					            <div class="col-sm-9"><input type="text" class="form-control" placeholder="' . htmlspecialchars($v['name']) . '" id="' . $formattedId . '" name="' . $k . '" size="40" maxlength="' . $v['maxlen'] . '" value="' . $v['value'] . '" ' . $cls . ' /></div>
-                                </div>';
-        }
-    }
-}
-/* end custom after */
-/* attachments */
-if ($hesk_settings['attachments']['use']) {
-
-    ?>
-    <div class="form-group">
-        <label for="attachments" class="control-label col-sm-3"><?php echo $hesklang['attachments']; ?>:</label>
-
-        <div class="col-sm-9">
-            <?php build_dropzone_markup(true); ?>
-        </div>
-    </div>
-    <hr/>
-    <?php
-    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
-}
-?>
-<!-- Admin options -->
-<?php
-if (!isset($_SESSION['as_notify'])) {
-    $_SESSION['as_notify'] = $_SESSION['notify_customer_new'] ? 1 : 0;
-}
-?>
-<div class="form-group">
-    <label class="col-sm-3 control-label"><?php echo $hesklang['addop']; ?>:</label>
-
-    <div class="col-sm-9">
-        <label><input type="checkbox" id="notify-email" name="notify"
-                      value="1" <?php echo empty($_SESSION['as_notify']) ? '' : 'checked="checked"'; ?> /> <?php echo $hesklang['seno']; ?>
-        </label><br/>
-        <label><input type="checkbox" name="show"
-                      value="1" <?php echo (!isset($_SESSION['as_show']) || !empty($_SESSION['as_show'])) ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['otas']; ?>
-        </label><br/>
-        <hr/>
-    </div>
-</div>
-<?php
-if (hesk_checkPermission('can_assign_others',0))
-{
-  if (in_array('owner',$_SESSION['iserror'])) {echo '<div class="form-group has-error">';} else {echo '<div class="form-group">';} ?>
-    <label for="owner" class="col-sm-3 control-label"><?php echo $hesklang['asst2']; ?>:</label>
-    <div class="col-sm-9">
-        <select class="form-control" name="owner" >
-        <option value="-1"> &gt; <?php echo $hesklang['unas']; ?> &lt; </option>
-        <?php
-
-        if ($hesk_settings['autoassign'])
-        {
-            echo '<option value="-2"> &gt; ' . $hesklang['aass'] . ' &lt; </option>';
-        }
-
-        $owner = isset($_SESSION['as_owner']) ? intval($_SESSION['as_owner']) : 0;
-
-        foreach ($admins as $k=>$v)
-        {
-            if ($k == $owner)
-            {
-                echo '<option value="'.$k.'" selected="selected">'.$v.'</option>';
-            }
-            else
-            {
-                echo '<option value="'.$k.'">'.$v.'</option>';
-            }
-
-        }
-        ?>
-        </select>
-    </div>
-</div>
-<?php
-}
-elseif (hesk_checkPermission('can_assign_self',0))
-{
-$checked = (!isset($_SESSION['as_owner']) || !empty($_SESSION['as_owner'])) ? 'checked="checked"' : '';
-?>
-<div class="form-group">
-    <div class="col-sm-9 col-sm-offset-3">
-        <label><input type="checkbox" name="assing_to_self" value="1" <?php echo $checked; ?> /> <?php echo $hesklang['asss2']; ?></label>
-    </div>
-</div>
-<?php
-}
-
-if ($modsForHesk_settings['request_location']):
-    ?>
-    <div class="form-group">
-        <label for="location" class="col-md-3 control-label"><?php echo $hesklang['location_colon']; ?></label>
-
-        <div class="col-sm-9">
-            <p id="console"><?php echo $hesklang['requesting_location_ellipsis']; ?></p>
-
-            <div id="map" style="height: 300px; display:none">
-            </div>
-        </div>
-    </div>
-<?php endif; ?>
-<!-- Submit -->
-<div class="form-group">
-    <div class="col-sm-9 col-sm-offset-3">
-        <input type="hidden" id="latitude" name="latitude" value="E-0">
-        <input type="hidden" id="longitude" name="longitude" value="E-0">
-        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
-        <input type="submit" value="<?php echo $hesklang['sub_ticket']; ?>" class="btn btn-default">
-    </div>
-</div>
-</form>
 <script>
     buildValidatorForTicketSubmission("form1",
         "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>");
diff --git a/admin/password.php b/admin/password.php
index efec81aa..eabb235b 100644
--- a/admin/password.php
+++ b/admin/password.php
@@ -30,6 +30,7 @@
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
+define('PAGE_TITLE', 'LOGIN');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -38,7 +39,6 @@ require(HESK_PATH . 'inc/common.inc.php');
 // Connect to database and check for brute force attempts
 hesk_load_database_functions();
 hesk_dbConnect();
-hesk_limitBfAttempts();
 
 $modsForHesk_settings = mfh_getSettings();
 
@@ -112,6 +112,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             }
         }
     }
+    hesk_limitBfAttempts();
 
     // Get email
     $email = hesk_validateEmail(hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer['email'] = $hesklang['enter_valid_email'];
@@ -236,32 +237,38 @@ if ($hesk_settings['recaptcha_use'] == 2) {
 }
 
 $hesk_settings['tmp_title'] = $hesk_settings['hesk_title'] . ' - ' . $hesklang['passr'];
-require_once(HESK_PATH . 'inc/header.inc.php');
+require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 ?>
-<ol class="breadcrumb">
-    <li><a href="<?php echo $hesk_settings['site_url']; ?>"><?php echo $hesk_settings['site_title']; ?></a></li>
-    <li><a href="index.php"><?php echo $hesklang['admin_login']; ?></a></li>
-    <li class="active"><?php echo $hesklang['passr']; ?></li>
-</ol>
-
-<div class="row">
-    <div class="col-md-10 col-md-offset-1">
-        <form action="password.php" method="post" name="form1" class="form-signin form-horizontal" role="form">
+<div class="login-box">
+    <div class="login-logo">
+        <?php echo $hesk_settings['hesk_title']; ?>
+    </div>
+    <div class="login-box-body">
+        <h4 class="login-box-msg">
+            <?php echo $hesklang['passr']; ?>
+        </h4>
+        <form action="password.php" method="post" name="form1" class="form-horizontal" role="form">
             <?php
             /* This will handle error, success and notice messages */
             hesk_handle_messages();
+
+            $has_error = '';
+            if (in_array('email', $_SESSION['a_iserror'])) {
+                $has_error = 'has-error';
+            }
+
+            $form_email = '';
+            if (isset($email)) {
+                $form_email = stripslashes(hesk_input($email));
+            }
             ?>
-            <h2><span <?php echo $iconDisplay; ?>><span
-                        class="mega-octicon octicon-sign-in"></span>&nbsp;</span><?php echo $hesklang['passr']; ?></h2>
-
-            <div class="footerWithBorder blankSpace"></div>
-            <div class="form-group <?php echo in_array('email', $_SESSION['a_iserror']) ? 'has-error' : ''; ?>">
-                <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?></label>
-
+            <div class="form-group <?php echo $has_error; ?>">
+                <label for="email" class="col-sm-3 control-label">
+                    <?php echo $hesklang['email']; ?>
+                </label>
                 <div class="col-sm-9">
-                    <input type="text" name="email" size="35" value="<?php if (isset($email)) {
-                        echo stripslashes(hesk_input($email));
-                    } ?>" class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>">
+                    <input type="text" name="email" size="35" value="<?php echo $form_email; ?>"
+                           class="form-control" placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>">
                 </div>
             </div>
             <?php
@@ -287,8 +294,8 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                                         play_again: "<?php echo hesk_slashJS($hesklang['play_again']); ?>",
                                         cant_hear_this: "<?php echo hesk_slashJS($hesklang['cant_hear_this']); ?>",
                                         incorrect_try_again: "<?php echo hesk_slashJS($hesklang['incorrect_try_again']); ?>",
-                                        image_alt_text: "<?php echo hesk_slashJS($hesklang['image_alt_text']); ?>",
-                                    },
+                                        image_alt_text: "<?php echo hesk_slashJS($hesklang['image_alt_text']); ?>"
+                                    }
                                 };
                             </script>
                         <?php
@@ -318,19 +325,15 @@ require_once(HESK_PATH . 'inc/header.inc.php');
             }
             ?>
             <div class="form-group">
-                <div class="col-sm-10 col-sm-offset-1">
+                <div class="col-sm-9 col-sm-offset-3">
                     <input type="submit" value="<?php echo $hesklang['passs']; ?>" class="btn btn-default">
                 </div>
             </div>
         </form>
     </div>
 </div>
-
 <?php
 // Clean session errors
 hesk_cleanSessionVars('a_iserror');
 hesk_cleanSessionVars('img_a_verified');
-
-// Print footer
-require_once(HESK_PATH . 'inc/footer.inc.php');
 ?>
diff --git a/admin/profile.php b/admin/profile.php
index a848af8a..83570eec 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/profile_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -84,75 +85,80 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print admin navigation */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row">
-    <div class="col-md-8 col-md-offset-2 pad-down-20">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-
-        if (defined('WARN_PASSWORD')) {
-            hesk_show_notice($hesklang['chdp2'], $hesklang['security']);
-        }
-        ?>
-
-        <h3><?php echo $hesklang['profile_for'] . ' <b>' . $_SESSION['new']['user']; ?></b></h3>
-        <h6><?php echo $hesklang['req_marked_with']; ?> <span class="important">*</span></h6>
-
-        <div class="footerWithBorder blankSpace"></div>
-
-        <?php
-        if ($hesk_settings['can_sel_lang']) {
-            /* Update preferred language in the database? */
-            if (isset($_GET['save_language'])) {
-                $newlang = hesk_input(hesk_GET('language'));
-
-                /* Only update if it's a valid language */
-                if (isset($hesk_settings['languages'][$newlang])) {
-                    $newlang = ($newlang == HESK_DEFAULT_LANGUAGE) ? "NULL" : "'" . hesk_dbEscape($newlang) . "'";
-                    hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `language`=$newlang WHERE `id`='" . intval($_SESSION['id']) . "' LIMIT 1");
-                }
-            }
-
-            $str = '<form class="form-horizontal" role="form" method="get" action="profile.php">';
-            $str .= '<input type="hidden" name="save_language" value="1" />';
-            $str .= '<div class="form-group">';
-            $str .= '<label for="language" class="col-sm-3 control-label">' . $hesklang['chol'] . ':</label>';
-
-            if (!isset($_GET)) {
-                $_GET = array();
-            }
-
-            foreach ($_GET as $k => $v) {
-                if ($k == 'language' || $k == 'save_language') {
-                    continue;
-                }
-                $str .= '<input type="hidden" name="' . htmlentitieshesk_htmlentities($k) . '" value="' . hesk_htmlentities($v) . '" />';
-            }
-
-            $str .= '<div class="col-sm-9"><select class="form-control" name="language" onchange="this.form.submit()">';
-            $str .= hesk_listLanguages(0);
-            $str .= '</select></div>';
-            $str .= '</div>'
-
-            ?>
-            <script language="javascript" type="text/javascript">
-                document.write('<?php echo str_replace(array('"','<','=','>',"'"),array('\42','\74','\75','\76','\47'),$str . '</form>'); ?>');
-            </script>
-            <noscript>
-                <?php
-                echo $str . '<input type="submit" value="' . $hesklang['go'] . '" /></form>';
-                ?>
-            </noscript>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['profile_for']; ?> <b><?php echo $_SESSION['new']['user']; ?></b>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <?php echo $hesklang['req_marked_with']; ?> <span class="important">*</span>
             <?php
-        }
-        ?>
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
 
-        <form role="form" class="form-horizontal" method="post" action="profile.php" name="form1" data-toggle="validator">
-            <?php hesk_profile_tab('new'); ?>
-        </form>
+            if (defined('WARN_PASSWORD')) {
+                hesk_show_notice($hesklang['chdp2'], $hesklang['security']);
+            }
+
+            if ($hesk_settings['can_sel_lang']) {
+                /* Update preferred language in the database? */
+                if (isset($_GET['save_language'])) {
+                    $newlang = hesk_input(hesk_GET('language'));
+
+                    /* Only update if it's a valid language */
+                    if (isset($hesk_settings['languages'][$newlang])) {
+                        $newlang = ($newlang == HESK_DEFAULT_LANGUAGE) ? "NULL" : "'" . hesk_dbEscape($newlang) . "'";
+                        hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `language`=$newlang WHERE `id`='" . intval($_SESSION['id']) . "' LIMIT 1");
+                    }
+                }
+
+                $str = '<form class="form-horizontal" role="form" method="get" action="profile.php">';
+                $str .= '<input type="hidden" name="save_language" value="1" />';
+                $str .= '<div class="form-group">';
+                $str .= '<label for="language" class="col-sm-3 control-label">' . $hesklang['chol'] . ':</label>';
+
+                if (!isset($_GET)) {
+                    $_GET = array();
+                }
+
+                foreach ($_GET as $k => $v) {
+                    if ($k == 'language' || $k == 'save_language') {
+                        continue;
+                    }
+                    $str .= '<input type="hidden" name="' . htmlentitieshesk_htmlentities($k) . '" value="' . hesk_htmlentities($v) . '" />';
+                }
+
+                $str .= '<div class="col-sm-9"><select class="form-control" name="language" onchange="this.form.submit()">';
+                $str .= hesk_listLanguages(0);
+                $str .= '</select></div>';
+                $str .= '</div>'
+
+                ?>
+                <script language="javascript" type="text/javascript">
+                    document.write('<?php echo str_replace(array('"','<','=','>',"'"),array('\42','\74','\75','\76','\47'),$str . '</form>'); ?>');
+                </script>
+                <noscript>
+                    <?php
+                    echo $str . '<input type="submit" value="' . $hesklang['go'] . '" /></form>';
+                    ?>
+                </noscript>
+                <?php
+            }
+            ?>
+
+            <form role="form" class="form-horizontal" method="post" action="profile.php" name="form1" data-toggle="validator">
+                <?php hesk_profile_tab('new'); ?>
+            </form>
+        </div>
     </div>
-</div>
+</section>
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/reports.php b/admin/reports.php
index 9e9fd630..1f8fa928 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/reporting_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -214,127 +215,137 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-    <div class="row move-down-20">
-        <div align="left" class="col-md-4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <?php echo $hesklang['reports_tab']; ?> <a href="#"
-                                                               onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['reports_intro']); ?>')"><i
-                            class="fa fa-question-circle settingsquestionmark"></i></a>
-                </div>
-                <?php if (hesk_checkPermission('can_export', 0)) {
-                    $canExport = true;
-                    $panelMargin = '-15px';
-                } else {
-                    $canExport = false;
-                }
-                ?>
-                <div class="panel-body" <?php if ($canExport) echo 'style="margin-top: -15px";'; ?>>
-                    <?php
-                    // Show a link to export.php if user has permission to do so
-                    if ($canExport) {
-                        echo '<small><a title="' . $hesklang['export'] . '" href="export.php">' . $hesklang['export'] . '</a></small><div class="blankSpace"></div>';
-                    }
-                    ?>
-                    <form action="reports.php" method="get" name="form1" role="form">
-                        <div class="form-group">
-                            <label for="dtrg" class="control-label"><?php echo $hesklang['dtrg']; ?></b>:</label>
-
-                            <div class="radio move-right-20">
-                                <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
-                                <select name="time" onclick="document.getElementById('w0').checked = true"
-                                        onfocus="document.getElementById('w0').checked = true"
-                                        style="margin-top:5px;margin-bottom:5px;">
-                                    <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
-                                        (<?php echo $hesklang['d' . date('w')]; ?>)
-                                    </option>
-                                    <option value="2" <?php echo $selected['time'][2]; ?>><?php echo $hesklang['r2']; ?>
-                                        (<?php echo $hesklang['d' . date('w', mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')))]; ?>
-                                        )
-                                    </option>
-                                    <option value="3" <?php echo $selected['time'][3]; ?>><?php echo $hesklang['r3']; ?>
-                                        (<?php echo $hesklang['m' . date('n')]; ?>)
-                                    </option>
-                                    <option value="4" <?php echo $selected['time'][4]; ?>><?php echo $hesklang['r4']; ?>
-                                        (<?php echo $hesklang['m' . date('n', mktime(0, 0, 0, date('m') - 1, date('d'), date('Y')))]; ?>
-                                        )
-                                    </option>
-                                    <option
-                                        value="5" <?php echo $selected['time'][5]; ?>><?php echo $hesklang['r5']; ?></option>
-                                    <option
-                                        value="6" <?php echo $selected['time'][6]; ?>><?php echo $hesklang['r6']; ?></option>
-                                    <option
-                                        value="7" <?php echo $selected['time'][7]; ?>><?php echo $hesklang['r7']; ?></option>
-                                    <option
-                                        value="8" <?php echo $selected['time'][8]; ?>><?php echo $hesklang['r8']; ?></option>
-                                    <option
-                                        value="9" <?php echo $selected['time'][9]; ?>><?php echo $hesklang['r9']; ?></option>
-                                    <option
-                                        value="10" <?php echo $selected['time'][10]; ?>><?php echo $hesklang['r10']; ?>
-                                        (<?php echo date('Y'); ?>)
-                                    </option>
-                                    <option
-                                        value="11" <?php echo $selected['time'][11]; ?>><?php echo $hesklang['r11']; ?>
-                                        (<?php echo date('Y', mktime(0, 0, 0, date('m'), date('d'), date('Y') - 1)); ?>)
-                                    </option>
-                                    <option
-                                        value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
-                                </select>
-                            </div>
-                            <div class="radio move-right-20">
-                                <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
-                                <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
-                                                                        value="<?php echo $input_datefrom; ?>"
-                                                                        id="datefrom" class="tcal" size="10"
-                                                                        onclick="document.getElementById('w1').checked = true"
-                                                                        onfocus="document.getElementById('w1').checked = true;this.focus;"/>
-                                <?php echo $hesklang['to']; ?> <input type="text" name="dateto"
-                                                                      value="<?php echo $input_dateto; ?>" id="dateto"
-                                                                      class="tcal" size="10"
-                                                                      onclick="document.getElementById('w1').checked = true"
-                                                                      onfocus="document.getElementById('w1').checked = true; this.focus;"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="type" class="control-label"><?php echo $hesklang['crt']; ?></b>:</label>
-                            <select name="type" class="form-control">
-                                <option
-                                    value="1" <?php echo $selected['type'][1]; ?>><?php echo $hesklang['t1']; ?></option>
-                                <option
-                                    value="2" <?php echo $selected['type'][2]; ?>><?php echo $hesklang['t2']; ?></option>
-                                <option
-                                    value="3" <?php echo $selected['type'][3]; ?>><?php echo $hesklang['t3']; ?></option>
-                                <option
-                                    value="4" <?php echo $selected['type'][4]; ?>><?php echo $hesklang['t4']; ?></option>
-                            </select>
-                        </div>
-                        <div class="form-group text-center">
-                            <input type="submit" value="<?php echo $hesklang['dire']; ?>" class="btn btn-default"/>
-                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                        </div>
-                    </form>
-                </div>
+<section class="content">
+    <div class="box">
+        <?php if (hesk_checkPermission('can_export', 0)) {
+            $canExport = true;
+            $panelMargin = '-15px';
+        } else {
+            $canExport = false;
+        }
+        ?>
+        <div class="box-header">
+            <h1 class="box-title">
+                <?php echo $hesklang['reports_tab']; ?> <a href="#"
+                                                           onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['reports_intro']); ?>')"><i
+                        class="fa fa-question-circle settingsquestionmark"></i></a>
+            </h1>
+            <?php
+            // Show a link to export.php if user has permission to do so
+            if ($canExport) {
+                echo '<br><small><a title="' . $hesklang['export'] . '" href="export.php">' . $hesklang['export'] . '</a></small><div class="blankSpace"></div>';
+            }
+            ?>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
         </div>
-        <div class="col-sm-8">
+        <div class="box-body">
+            <form action="reports.php" method="get" name="form1" role="form">
+                <div class="form-group">
+                    <label for="dtrg" class="control-label"><?php echo $hesklang['dtrg']; ?>:</label>
+
+                    <div class="radio move-right-20">
+                        <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
+                        <select name="time" onclick="document.getElementById('w0').checked = true"
+                                onfocus="document.getElementById('w0').checked = true"
+                                style="margin-top:5px;margin-bottom:5px;">
+                            <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
+                                (<?php echo $hesklang['d' . date('w')]; ?>)
+                            </option>
+                            <option value="2" <?php echo $selected['time'][2]; ?>><?php echo $hesklang['r2']; ?>
+                                (<?php echo $hesklang['d' . date('w', mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')))]; ?>
+                                )
+                            </option>
+                            <option value="3" <?php echo $selected['time'][3]; ?>><?php echo $hesklang['r3']; ?>
+                                (<?php echo $hesklang['m' . date('n')]; ?>)
+                            </option>
+                            <option value="4" <?php echo $selected['time'][4]; ?>><?php echo $hesklang['r4']; ?>
+                                (<?php echo $hesklang['m' . date('n', mktime(0, 0, 0, date('m') - 1, date('d'), date('Y')))]; ?>
+                                )
+                            </option>
+                            <option
+                                value="5" <?php echo $selected['time'][5]; ?>><?php echo $hesklang['r5']; ?></option>
+                            <option
+                                value="6" <?php echo $selected['time'][6]; ?>><?php echo $hesklang['r6']; ?></option>
+                            <option
+                                value="7" <?php echo $selected['time'][7]; ?>><?php echo $hesklang['r7']; ?></option>
+                            <option
+                                value="8" <?php echo $selected['time'][8]; ?>><?php echo $hesklang['r8']; ?></option>
+                            <option
+                                value="9" <?php echo $selected['time'][9]; ?>><?php echo $hesklang['r9']; ?></option>
+                            <option
+                                value="10" <?php echo $selected['time'][10]; ?>><?php echo $hesklang['r10']; ?>
+                                (<?php echo date('Y'); ?>)
+                            </option>
+                            <option
+                                value="11" <?php echo $selected['time'][11]; ?>><?php echo $hesklang['r11']; ?>
+                                (<?php echo date('Y', mktime(0, 0, 0, date('m'), date('d'), date('Y') - 1)); ?>)
+                            </option>
+                            <option
+                                value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
+                        </select>
+                    </div>
+                    <div class="radio move-right-20">
+                        <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
+                        <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
+                                                                value="<?php echo $input_datefrom; ?>"
+                                                                id="datefrom" class="tcal" size="10"
+                                                                onclick="document.getElementById('w1').checked = true"
+                                                                onfocus="document.getElementById('w1').checked = true;this.focus;"/>
+                        <?php echo $hesklang['to']; ?> <input type="text" name="dateto"
+                                                              value="<?php echo $input_dateto; ?>" id="dateto"
+                                                              class="tcal" size="10"
+                                                              onclick="document.getElementById('w1').checked = true"
+                                                              onfocus="document.getElementById('w1').checked = true; this.focus;"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="type" class="control-label"><?php echo $hesklang['crt']; ?></b>:</label>
+                    <select name="type" class="form-control">
+                        <option
+                            value="1" <?php echo $selected['type'][1]; ?>><?php echo $hesklang['t1']; ?></option>
+                        <option
+                            value="2" <?php echo $selected['type'][2]; ?>><?php echo $hesklang['t2']; ?></option>
+                        <option
+                            value="3" <?php echo $selected['type'][3]; ?>><?php echo $hesklang['t3']; ?></option>
+                        <option
+                            value="4" <?php echo $selected['type'][4]; ?>><?php echo $hesklang['t4']; ?></option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <input type="submit" value="<?php echo $hesklang['dire']; ?>" class="btn btn-default"/>
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                </div>
+            </form>
+        </div>
+    </div>
+    <div class="box">
+        <div class="box-header">
+            <h1 class="box-title">
+                <?php
+                if ($date_from == $date_to) {
+                    echo hesk_dateToString($date_from, 0);
+                } else {
+                    echo hesk_dateToString($date_from, 0) . ' - ' . hesk_dateToString($date_to, 0);
+                }
+                ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
             <?php
             /* This will handle error, success and notice messages */
             hesk_handle_messages();
             ?>
 
             <?php
-            if ($date_from == $date_to) {
-                ?>
-                <h3><?php echo hesk_dateToString($date_from, 0); ?></h3>
-                <div class="footerWithBorder blankSpace"></div>
-                <?php
-            } else {
-                ?>
-                <h3><?php echo hesk_dateToString($date_from, 0); ?> - <?php echo hesk_dateToString($date_to, 0); ?></h3>
-                <div class="footerWithBorder blankSpace"></div>
-                <?php
-            }
 
             // Show a note if reports are limited
             if (!$can_run_reports_full) {
@@ -909,6 +920,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             ?>
         </div>
     </div>
+</section>
 <?php
 
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 837605b8..ccd10196 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -36,6 +36,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -72,384 +73,391 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-<div class="row pad-20">
-    <ul class="nav nav-tabs" role="tablist">
-        <?php
-        // Show a link to banned_emails.php if user has permission to do so
-        if (hesk_checkPermission('can_ban_emails', 0)) {
-            echo '
+<section class="content">
+    <div class="box">
+        <div class="box-body">
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs" role="tablist">
+                    <?php
+                    // Show a link to banned_emails.php if user has permission to do so
+                    if (hesk_checkPermission('can_ban_emails', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banemail'] . '" href="banned_emails.php">' . $hesklang['banemail'] . '</a>
             </li>';
-        }
-        if (hesk_checkPermission('can_ban_ips', 0)) {
-            echo '
+                    }
+                    if (hesk_checkPermission('can_ban_ips', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['banip'] . '" href="banned_ips.php">' . $hesklang['banip'] . '</a>
             </li>';
-        }
-        ?>
-        <li role="presentation" class="active">
-            <a href="#"><?php echo $hesklang['sm_title']; ?> <i class="fa fa-question-circle settingsquestionmark"
-                                                                onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['sm_intro']); ?>')"></i></a>
-        </li>
-        <?php
-        // Show a link to email tpl management if user has permission to do so
-        if (hesk_checkPermission('can_man_email_tpl', 0)) {
-            echo '
+                    }
+                    ?>
+                    <li role="presentation" class="active">
+                        <a href="#"><?php echo $hesklang['sm_title']; ?> <i class="fa fa-question-circle settingsquestionmark"
+                                                                            onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['sm_intro']); ?>')"></i></a>
+                    </li>
+                    <?php
+                    // Show a link to email tpl management if user has permission to do so
+                    if (hesk_checkPermission('can_man_email_tpl', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['email_templates'] . '" href="manage_email_templates.php">' . $hesklang['email_templates'] . '</a>
             </li>
             ';
-        }
-        if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
-            echo '
+                    }
+                    if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
+                        echo '
             <li role="presentation">
                 <a title="' . $hesklang['statuses'] . '" href="manage_statuses.php">' . $hesklang['statuses'] . '</a>
             </li>
             ';
-        }
-        ?>
-    </ul>
-    <div class="tab-content summaryList tabPadding">
-        <script language="javascript" type="text/javascript"><!--
-            function confirm_delete() {
-                if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }
-            //-->
-        </script>
-        <div class="row">
-            <?php
-            /* This will handle error, success and notice messages */
-            hesk_handle_messages();
-
-            if (isset($_SESSION['new_sm']) && !isset($_SESSION['edit_sm'])) {
-                $_SESSION['new_sm'] = hesk_stripArray($_SESSION['new_sm']);
-            }
-
-            if (isset($_SESSION['preview_sm'])) {
-                hesk_service_message($_SESSION['new_sm']);
-            }
-
-            if ($hesk_settings['kb_wysiwyg']) {
-                ?>
-                <script type="text/javascript">
-                    tinyMCE.init({
-                        mode: "exact",
-                        elements: "content",
-                        theme: "advanced",
-                        convert_urls: false,
-                        gecko_spellcheck: true,
-
-                        theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                        theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                        theme_advanced_buttons3: "",
-
-                        theme_advanced_toolbar_location: "top",
-                        theme_advanced_toolbar_align: "left",
-                        theme_advanced_statusbar_location: "bottom",
-                        theme_advanced_resizing: true
-                    });
-                </script>
-                <?php
-            }
-            ?>
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h4><?php echo $hesklang['ex_sm']; ?></h4>
-                </div>
-                <div class="panel-body">
-                    <?php
-
-                    // Get service messages from database
-                    $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'service_messages` ORDER BY `order` ASC');
-                    $num = hesk_dbNumRows($res);
-
-                    if ($num < 1) {
-                        echo '<p>' . $hesklang['no_sm'] . '</p>';
-                    } else {
-                        // List of staff
-                        if (!isset($admins)) {
-                            $admins = array();
-                            $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
-                            while ($row = hesk_dbFetchAssoc($res2)) {
-                                $admins[$row['id']] = $row['name'];
+                    }
+                    ?>
+                </ul>
+                <div class="tab-content summaryList tabPadding">
+                    <script language="javascript" type="text/javascript"><!--
+                        function confirm_delete() {
+                            if (confirm('<?php echo hesk_makeJsString($hesklang['delban_confirm']); ?>')) {
+                                return true;
+                            }
+                            else {
+                                return false;
                             }
                         }
-
-                        ?>
-                        <table class="table table-hover">
-                            <thead>
-                            <tr>
-                                <th><?php echo $hesklang['sm_mtitle']; ?></th>
-                                <th><?php echo $hesklang['sm_author']; ?></th>
-                                <th><?php echo $hesklang['sm_type']; ?></th>
-                                <th>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</th>
-                            </tr>
-                            </thead>
-                            <tbody>
+                        //-->
+                    </script>
+                    <div class="row">
+                        <div class="col-sm-12">
                             <?php
-                            $j = 1;
-                            $k = 1;
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
 
-                            while ($sm = hesk_dbFetchAssoc($res)) {
-                                $faIcon = $sm['icon'];
-                                switch ($sm['style']) {
-                                    case 1:
-                                        $sm_style = "alert alert-success";
-                                        break;
-                                    case 2:
-                                        $sm_style = "alert alert-info";
-                                        break;
-                                    case 3:
-                                        $sm_style = "alert alert-warning";
-                                        break;
-                                    case 4:
-                                        $sm_style = "alert alert-danger";
-                                        break;
-                                    default:
-                                        $sm_style = "none";
-                                }
+                            if (isset($_SESSION['new_sm']) && !isset($_SESSION['edit_sm'])) {
+                                $_SESSION['new_sm'] = hesk_stripArray($_SESSION['new_sm']);
+                            }
 
-                                $type = $sm['type'] ? $hesklang['sm_draft'] : $hesklang['sm_published'];
+                            if (isset($_SESSION['preview_sm'])) {
+                                hesk_service_message($_SESSION['new_sm']);
+                            }
 
+                            if ($hesk_settings['kb_wysiwyg']) {
                                 ?>
-                                <tr>
-                                    <td>
-                                        <div class="<?php echo $sm_style; ?>">
-                                            <i class="<?php echo $faIcon; ?>"></i>
-                                            <b><?php echo $sm['title']; ?></b>
-                                        </div>
-                                    </td>
-                                    <td><?php echo(isset($admins[$sm['author']]) ? $admins[$sm['author']] : $hesklang['e_udel']); ?></td>
-                                    <td><?php echo $type; ?></td>
-                                    <td>
-                                        <?php
-                                        if ($num > 1) {
-                                            if ($k == 1) {
-                                                ?>
-                                                <img src="../img/blank.gif" width="16" height="16" alt=""
-                                                     style="padding:3px;border:none;"/>
-                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
-                                                    <i class="fa fa-arrow-down font-size-16p green"
-                                                       data-toggle="tooltip" data-placement="top"
-                                                       data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
-                                                <?php
-                                            } elseif ($k == $num) {
-                                                ?>
-                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
-                                                    <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip"
-                                                       data-placement="top"
-                                                       data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
-                                                <img src="../img/blank.gif" width="16" height="16" alt=""
-                                                     style="padding:3px;border:none;"/>
-                                                <?php
-                                            } else {
-                                                ?>
-                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
-                                                    <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip"
-                                                       data-placement="top"
-                                                       data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
-                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
-                                                    <i class="fa fa-arrow-down font-size-16p green"
-                                                       data-toggle="tooltip" data-placement="top"
-                                                       data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
-                                                <?php
-                                            }
-                                        }
-                                        ?>
-                                        <a href="service_messages.php?a=edit_sm&amp;id=<?php echo $sm['id']; ?>">
-                                            <i class="fa fa-pencil font-size-16p orange" data-toggle="tooltip"
-                                               data-placement="top"
-                                               data-original-title="<?php echo $hesklang['edit']; ?>"></i></a>
-                                        <a href="service_messages.php?a=remove_sm&amp;id=<?php echo $sm['id']; ?>&amp;token=<?php hesk_token_echo(); ?>"
-                                           onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_sm']); ?>');">
-                                            <i class="fa fa-times font-size-16p red" data-toggle="tooltip"
-                                               data-placement="top"
-                                               data-original-title="<?php echo $hesklang['delete']; ?>"></i></a>&nbsp;
-                                    </td>
-                                </tr>
+                                <script type="text/javascript">
+                                    tinyMCE.init({
+                                        mode: "exact",
+                                        elements: "content",
+                                        theme: "advanced",
+                                        convert_urls: false,
+                                        gecko_spellcheck: true,
+
+                                        theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
+                                        theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
+                                        theme_advanced_buttons3: "",
+
+                                        theme_advanced_toolbar_location: "top",
+                                        theme_advanced_toolbar_align: "left",
+                                        theme_advanced_statusbar_location: "bottom",
+                                        theme_advanced_resizing: true
+                                    });
+                                </script>
                                 <?php
-                                $j++;
-                                $k++;
-                            } // End while
-
-                            ?>
-                            </tbody>
-                        </table>
-                        <?php
-                    }
-
-                    ?>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h4><a name="new_article"></a><?php echo hesk_SESSION('edit_sm') ? $hesklang['edit_sm'] : $hesklang['new_sm']; ?></h4>
-                </div>
-                <div class="panel-body">
-                    <form action="service_messages.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
-                        <div class="form-group">
-                            <label for="style"
-                                   class="col-md-2 control-label"><?php echo $hesklang['sm_style']; ?></label>
-
-                            <div class="col-md-2">
-                                <div class="radio alert pad-5" style="box-shadow: none; border-radius: 4px;">
-                                    <label>
-                                        <input type="radio" name="style" value="0" onclick="setIcon('')"
-                                            <?php if (!isset($_SESSION['new_sm']['style']) || (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 0)) {
-                                                echo 'checked';
-                                            } ?>>
-                                        <?php echo $hesklang['sm_none']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-2">
-                                <div class="radio alert alert-success pad-5">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="1"
-                                               onclick="setIcon('fa fa-check-circle')"
-                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 1) {
-                                                echo 'checked';
-                                            } ?>>
-                                        <?php echo $hesklang['sm_success']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-2">
-                                <div class="radio alert alert-info pad-5" onclick="setIcon('fa fa-comment')">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="2"
-                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 2) {
-                                                echo 'checked';
-                                            } ?>>
-                                        <?php echo $hesklang['sm_info']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-2">
-                                <div class="radio alert alert-warning pad-5"
-                                     onclick="setIcon('fa fa-exclamation-triangle')">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="3"
-                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 3) {
-                                                echo 'checked';
-                                            } ?>>
-                                        <?php echo $hesklang['sm_notice']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                            <div class="col-md-2">
-                                <div class="radio alert alert-danger pad-5" onclick="setIcon('fa fa-times-circle')">
-                                    <label style="margin-top: -5px">
-                                        <input type="radio" name="style" value="4"
-                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 4) {
-                                                echo 'checked';
-                                            } ?> >
-                                        <?php echo $hesklang['sm_error']; ?>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="icon" class="col-md-2 control-label"><?php echo $hesklang['sm_icon']; ?></label>
-                            <?php
-                            $icon = '';
-                            if (isset($_SESSION['new_sm']['icon'])) {
-                                $icon = $_SESSION['new_sm']['icon'];
                             }
                             ?>
-                            <div class="col-md-10">
-                                <p style="display:none" id="no-icon"><?php echo $hesklang['sm_no_icon']; ?></p>
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h4><?php echo $hesklang['ex_sm']; ?></h4>
+                                </div>
+                                <div class="panel-body">
+                                    <?php
 
-                                <p style="display:none" id="search-icon"><?php echo $hesklang['sm_search_icon']; ?></p>
+                                    // Get service messages from database
+                                    $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'service_messages` ORDER BY `order` ASC');
+                                    $num = hesk_dbNumRows($res);
 
-                                <p style="display:none"
-                                   id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
+                                    if ($num < 1) {
+                                        echo '<p>' . $hesklang['no_sm'] . '</p>';
+                                    } else {
+                                        // List of staff
+                                        if (!isset($admins)) {
+                                            $admins = array();
+                                            $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`");
+                                            while ($row = hesk_dbFetchAssoc($res2)) {
+                                                $admins[$row['id']] = $row['name'];
+                                            }
+                                        }
 
-                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
-                                     data-icon="<?php echo $icon; ?>"></div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
+                                        ?>
+                                        <table class="table table-hover">
+                                            <thead>
+                                            <tr>
+                                                <th><?php echo $hesklang['sm_mtitle']; ?></th>
+                                                <th><?php echo $hesklang['sm_author']; ?></th>
+                                                <th><?php echo $hesklang['sm_type']; ?></th>
+                                                <th>&nbsp;<?php echo $hesklang['opt']; ?>&nbsp;</th>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <?php
+                                            $j = 1;
+                                            $k = 1;
 
-                            <div class="col-md-2">
-                                <div class="radio pad-5">
-                                    <label>
-                                        <input type="radio" name="type" value="0"
-                                            <?php if (!isset($_SESSION['new_sm']['type']) || (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 0)) {
-                                                echo 'checked';
-                                            } ?> >
-                                        <?php echo $hesklang['sm_published']; ?>
-                                    </label>
+                                            while ($sm = hesk_dbFetchAssoc($res)) {
+                                                $faIcon = $sm['icon'];
+                                                switch ($sm['style']) {
+                                                    case 1:
+                                                        $sm_style = "alert alert-success";
+                                                        break;
+                                                    case 2:
+                                                        $sm_style = "alert alert-info";
+                                                        break;
+                                                    case 3:
+                                                        $sm_style = "alert alert-warning";
+                                                        break;
+                                                    case 4:
+                                                        $sm_style = "alert alert-danger";
+                                                        break;
+                                                    default:
+                                                        $sm_style = "none";
+                                                }
+
+                                                $type = $sm['type'] ? $hesklang['sm_draft'] : $hesklang['sm_published'];
+
+                                                ?>
+                                                <tr>
+                                                    <td>
+                                                        <div class="<?php echo $sm_style; ?>">
+                                                            <i class="<?php echo $faIcon; ?>"></i>
+                                                            <b><?php echo $sm['title']; ?></b>
+                                                        </div>
+                                                    </td>
+                                                    <td><?php echo(isset($admins[$sm['author']]) ? $admins[$sm['author']] : $hesklang['e_udel']); ?></td>
+                                                    <td><?php echo $type; ?></td>
+                                                    <td>
+                                                        <?php
+                                                        if ($num > 1) {
+                                                            if ($k == 1) {
+                                                                ?>
+                                                                <img src="../img/blank.gif" width="16" height="16" alt=""
+                                                                     style="padding:3px;border:none;"/>
+                                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
+                                                                    <i class="fa fa-arrow-down font-size-16p green"
+                                                                       data-toggle="tooltip" data-placement="top"
+                                                                       data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                                                                <?php
+                                                            } elseif ($k == $num) {
+                                                                ?>
+                                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
+                                                                    <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip"
+                                                                       data-placement="top"
+                                                                       data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                                <img src="../img/blank.gif" width="16" height="16" alt=""
+                                                                     style="padding:3px;border:none;"/>
+                                                                <?php
+                                                            } else {
+                                                                ?>
+                                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
+                                                                    <i class="fa fa-arrow-up font-size-16p green" data-toggle="tooltip"
+                                                                       data-placement="top"
+                                                                       data-original-title="<?php echo $hesklang['move_up']; ?>"></i></a>
+                                                                <a href="service_messages.php?a=order_sm&amp;id=<?php echo $sm['id']; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
+                                                                    <i class="fa fa-arrow-down font-size-16p green"
+                                                                       data-toggle="tooltip" data-placement="top"
+                                                                       data-original-title="<?php echo $hesklang['move_dn']; ?>"></i></a>
+                                                                <?php
+                                                            }
+                                                        }
+                                                        ?>
+                                                        <a href="service_messages.php?a=edit_sm&amp;id=<?php echo $sm['id']; ?>">
+                                                            <i class="fa fa-pencil font-size-16p orange" data-toggle="tooltip"
+                                                               data-placement="top"
+                                                               data-original-title="<?php echo $hesklang['edit']; ?>"></i></a>
+                                                        <a href="service_messages.php?a=remove_sm&amp;id=<?php echo $sm['id']; ?>&amp;token=<?php hesk_token_echo(); ?>"
+                                                           onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_sm']); ?>');">
+                                                            <i class="fa fa-times font-size-16p red" data-toggle="tooltip"
+                                                               data-placement="top"
+                                                               data-original-title="<?php echo $hesklang['delete']; ?>"></i></a>&nbsp;
+                                                    </td>
+                                                </tr>
+                                                <?php
+                                                $j++;
+                                                $k++;
+                                            } // End while
+
+                                            ?>
+                                            </tbody>
+                                        </table>
+                                        <?php
+                                    }
+
+                                    ?>
                                 </div>
                             </div>
-                            <div class="col-md-2">
-                                <div class="radio pad-5">
-                                    <label>
-                                        <input type="radio" name="type" value="1"
-                                            <?php if (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 1) {
-                                                echo 'checked';
-                                            } ?> >
-                                        <?php echo $hesklang['sm_draft']; ?>
-                                    </label>
+
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h4><a name="new_article"></a><?php echo hesk_SESSION('edit_sm') ? $hesklang['edit_sm'] : $hesklang['new_sm']; ?></h4>
+                                </div>
+                                <div class="panel-body">
+                                    <form action="service_messages.php" method="post" name="form1" role="form" class="form-horizontal" data-toggle="validator">
+                                        <div class="form-group">
+                                            <label for="style"
+                                                   class="col-md-2 control-label"><?php echo $hesklang['sm_style']; ?></label>
+
+                                            <div class="col-md-2">
+                                                <div class="radio alert pad-5" style="box-shadow: none; border-radius: 4px;">
+                                                    <label>
+                                                        <input type="radio" name="style" value="0" onclick="setIcon('')"
+                                                            <?php if (!isset($_SESSION['new_sm']['style']) || (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 0)) {
+                                                                echo 'checked';
+                                                            } ?>>
+                                                        <?php echo $hesklang['sm_none']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-2">
+                                                <div class="radio alert alert-success pad-5">
+                                                    <label style="margin-top: -5px">
+                                                        <input type="radio" name="style" value="1"
+                                                               onclick="setIcon('fa fa-check-circle')"
+                                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 1) {
+                                                                echo 'checked';
+                                                            } ?>>
+                                                        <?php echo $hesklang['sm_success']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-2">
+                                                <div class="radio alert alert-info pad-5" onclick="setIcon('fa fa-comment')">
+                                                    <label style="margin-top: -5px">
+                                                        <input type="radio" name="style" value="2"
+                                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 2) {
+                                                                echo 'checked';
+                                                            } ?>>
+                                                        <?php echo $hesklang['sm_info']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-2">
+                                                <div class="radio alert alert-warning pad-5"
+                                                     onclick="setIcon('fa fa-exclamation-triangle')">
+                                                    <label style="margin-top: -5px">
+                                                        <input type="radio" name="style" value="3"
+                                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 3) {
+                                                                echo 'checked';
+                                                            } ?>>
+                                                        <?php echo $hesklang['sm_notice']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-2">
+                                                <div class="radio alert alert-danger pad-5" onclick="setIcon('fa fa-times-circle')">
+                                                    <label style="margin-top: -5px">
+                                                        <input type="radio" name="style" value="4"
+                                                            <?php if (isset($_SESSION['new_sm']['style']) && $_SESSION['new_sm']['style'] == 4) {
+                                                                echo 'checked';
+                                                            } ?> >
+                                                        <?php echo $hesklang['sm_error']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="icon" class="col-md-2 control-label"><?php echo $hesklang['sm_icon']; ?></label>
+                                            <?php
+                                            $icon = '';
+                                            if (isset($_SESSION['new_sm']['icon'])) {
+                                                $icon = $_SESSION['new_sm']['icon'];
+                                            }
+                                            ?>
+                                            <div class="col-md-10">
+                                                <p style="display:none" id="no-icon"><?php echo $hesklang['sm_no_icon']; ?></p>
+
+                                                <p style="display:none" id="search-icon"><?php echo $hesklang['sm_search_icon']; ?></p>
+
+                                                <p style="display:none"
+                                                   id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
+
+                                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
+                                                     data-icon="<?php echo $icon; ?>"></div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="type" class="col-md-2 control-label"><?php echo $hesklang['sm_type']; ?></label>
+
+                                            <div class="col-md-2">
+                                                <div class="radio pad-5">
+                                                    <label>
+                                                        <input type="radio" name="type" value="0"
+                                                            <?php if (!isset($_SESSION['new_sm']['type']) || (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 0)) {
+                                                                echo 'checked';
+                                                            } ?> >
+                                                        <?php echo $hesklang['sm_published']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-2">
+                                                <div class="radio pad-5">
+                                                    <label>
+                                                        <input type="radio" name="type" value="1"
+                                                            <?php if (isset($_SESSION['new_sm']['type']) && $_SESSION['new_sm']['type'] == 1) {
+                                                                echo 'checked';
+                                                            } ?> >
+                                                        <?php echo $hesklang['sm_draft']; ?>
+                                                    </label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="title"
+                                                   class="col-md-2 control-label"><?php echo $hesklang['sm_mtitle']; ?></label>
+
+                                            <div class="col-md-10">
+                                                <input class="form-control"
+                                                       placeholder="<?php echo htmlspecialchars($hesklang['sm_mtitle']); ?>"
+                                                       type="text" name="title" size="70" maxlength="255"
+                                                    <?php if (isset($_SESSION['new_sm']['title'])) {
+                                                        echo 'value="' . $_SESSION['new_sm']['title'] . '"';
+                                                    } ?> data-error="<?php echo htmlspecialchars($hesklang['sm_e_title']); ?>" required>
+                                                <div class="help-block with-errors"></div>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="message"
+                                                   class="col-md-2 control-label"><?php echo $hesklang['sm_msg']; ?></label>
+
+                                            <div class="col-md-10">
+                                    <textarea placeholder="<?php echo htmlspecialchars($hesklang['sm_msg']); ?>"
+                                              class="form-control" name="message" rows="25" cols="70" id="content">
+                                        <?php if (isset($_SESSION['new_sm']['message'])) {
+                                            echo $_SESSION['new_sm']['message'];
+                                        } ?>
+                                    </textarea>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <?php echo isset($_SESSION['edit_sm']) ? '<input type="hidden" name="a" value="save_sm" /><input type="hidden" name="id" value="' . intval($_SESSION['new_sm']['id']) . '" />' : '<input type="hidden" name="a" value="new_sm" />'; ?>
+                                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+
+                                            <div class="col-md-10 col-md-offset-2">
+                                                <div class="btn-group" role="group">
+                                                    <input type="submit" name="sm_save" value="<?php echo $hesklang['sm_save']; ?>"
+                                                           class="btn btn-primary">
+                                                    <input type="submit" name="sm_preview"
+                                                           value="<?php echo $hesklang['sm_preview']; ?>" class="btn btn-default">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </form>
                                 </div>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <label for="title"
-                                   class="col-md-2 control-label"><?php echo $hesklang['sm_mtitle']; ?></label>
-
-                            <div class="col-md-10">
-                                <input class="form-control"
-                                       placeholder="<?php echo htmlspecialchars($hesklang['sm_mtitle']); ?>"
-                                       type="text" name="title" size="70" maxlength="255"
-                                    <?php if (isset($_SESSION['new_sm']['title'])) {
-                                        echo 'value="' . $_SESSION['new_sm']['title'] . '"';
-                                    } ?> data-error="<?php echo htmlspecialchars($hesklang['sm_e_title']); ?>" required>
-                                <div class="help-block with-errors"></div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="message"
-                                   class="col-md-2 control-label"><?php echo $hesklang['sm_msg']; ?></label>
-
-                            <div class="col-md-10">
-                                <textarea placeholder="<?php echo htmlspecialchars($hesklang['sm_msg']); ?>"
-                                          class="form-control" name="message" rows="25" cols="70" id="content">
-                                    <?php if (isset($_SESSION['new_sm']['message'])) {
-                                        echo $_SESSION['new_sm']['message'];
-                                    } ?>
-                                </textarea>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <?php echo isset($_SESSION['edit_sm']) ? '<input type="hidden" name="a" value="save_sm" /><input type="hidden" name="id" value="' . intval($_SESSION['new_sm']['id']) . '" />' : '<input type="hidden" name="a" value="new_sm" />'; ?>
-                            <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-
-                            <div class="col-md-10 col-md-offset-2">
-                                <div class="btn-group" role="group">
-                                    <input type="submit" name="sm_save" value="<?php echo $hesklang['sm_save']; ?>"
-                                           class="btn btn-primary">
-                                    <input type="submit" name="sm_preview"
-                                           value="<?php echo $hesklang['sm_preview']; ?>" class="btn btn-default">
-                                </div>
-                            </div>
-                        </div>
-                    </form>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</section>
 
 <?php
 
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index 652966d2..7d510547 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -37,6 +37,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -48,30 +49,31 @@ define('CALENDAR', 1);
 /* Check permissions for this feature */
 hesk_checkPermission('can_view_tickets');
 
+
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
-
-/* Print admin navigation */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 ?>
-<div class="row">
-    <div class="col-md-12 move-down-20">
-        <?php
-        /* This will handle error, success and notice messages */
-        hesk_handle_messages();
-        ?>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4><?php echo $hesklang['tickets']; ?> <span class="nu-floatRight panel-button"><a
-                            href="new_ticket.php" class="btn btn-success"><span
-                                class="glyphicon glyphicon-plus-sign"></span> <?php echo $hesklang['nti']; ?></a></span></h4>
+<section class="content">
+    <?php hesk_handle_messages(); ?>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['tickets']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
+        </div>
+        <div class="box-body">
             <?php
             /* Print the list of tickets */
             $is_search = 1;
             require_once(HESK_PATH . 'inc/print_tickets.inc.php');
-
+            echo '<br>';
             /* Update staff default settings? */
             if (!empty($_GET['def'])) {
                 hesk_updateStaffDefaults();
@@ -82,12 +84,39 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             ?>
         </div>
     </div>
-    <?php
+    <div class="box">
+        <div class="box-body">
+            <?php
+            $hesk_settings['hesk_license']('HMgPSAxOw0KaWYgKGZpbGVfZXhpc3RzKEhFU0tfUEFUSCAuI
+        CdoZXNrX2xpY2Vuc2UucGhwJykpDQp7DQokaCA9ICghZW1wdHkoJF9TRVJWRVJbJ0hUVFBfSE9TVCddK
+        SkgPyAkX1NFUlZFUlsnSFRUUF9IT1NUJ10gOiAoKCFlbXB0eSgkX1NFUlZFUlsnU0VSVkVSX05BTUUnX
+        SkpID8gJF9TRVJWRVJbJ1NFUlZFUl9OQU1FJ10gOiBnZXRlbnYoJ1NFUlZFUl9OQU1FJykpOw0KJGggP
+        SBzdHJfcmVwbGFjZSgnd3d3LicsJycsc3RydG9sb3dlcigkaCkpOw0KaW5jbHVkZShIRVNLX1BBVEggL
+        iAnaGVza19saWNlbnNlLnBocCcpOw0KaWYgKGlzc2V0KCRoZXNrX3NldHRpbmdzWydsaWNlbnNlJ10pI
+        CYmIHN0cnBvcygkaGVza19zZXR0aW5nc1snbGljZW5zZSddLHNoYTEoJGguJ2gzJkZwMiNMYUEmNTkhd
+        yg4LlpjXSordVI1MTInKSkgIT09IGZhbHNlKQ0Kew0KJHMgPSAwOw0KfQ0KZWxzZQ0Kew0KZWNobyAnP
+        HAgc3R5bGU9InRleHQtYWxpZ246Y2VudGVyO2NvbG9yOnJlZDsiPklOVkFMSUQgTElDRU5TRSAoTk9UI
+        FJFR0lTVEVSRUQgRk9SICcuJGguJykhPC9wPic7DQp9DQp9DQppZiAoJHMpDQp7DQplY2hvICc8aHIgL
+        z48dGFibGUgYm9yZGVyPSIwIiB3aWR0aD0iMTAwJSI+PHRyPjx0ZD48Yj4nLiRoZXNrbGFuZ1sncmVtb
+        3ZlX3N0YXRlbWVudCddLic8L2I+PC90ZD48dGQgc3R5bGU9InRleHQtYWxpZ246cmlnaHQiPjxhIGhyZ
+        WY9IkphdmFzY3JpcHQ6dm9pZCgwKSIgb25jbGljaz0iYWxlcnQoXCcnLiRoZXNrbGFuZ1snc3VwcG9yd
+        F9ub3RpY2UnXS4nXCcpIj4nLiRoZXNrbGFuZ1snc2gnXS4nPC9hPjwvdGQ+PC90cj48L3RhYmxlPjxwP
+        icuJGhlc2tsYW5nWydzdXBwb3J0X3JlbW92ZSddLicuIDxhIGhyZWY9Imh0dHBzOi8vd3d3Lmhlc2suY
+        29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
+        C9wPic7DQp9DQo=', "\112");
+
+            /* Clean unneeded session variables */
+            hesk_cleanSessionVars('hide');
+            ?>
+        </div>
+    </div>
+</section>
+<?php
 
 
-    /* Print footer */
-    require_once(HESK_PATH . 'inc/footer.inc.php');
-    exit();
-    ?>
+/* Print footer */
+require_once(HESK_PATH . 'inc/footer.inc.php');
+exit();
+?>
 
 
diff --git a/admin/view_message_log.php b/admin/view_message_log.php
index 66fce341..d96f9b2b 100644
--- a/admin/view_message_log.php
+++ b/admin/view_message_log.php
@@ -8,6 +8,7 @@ define('PAGE_TITLE', 'ADMIN_TOOLS');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -24,75 +25,83 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-
-    <div class="row pad-20">
-        <div class="col-sm-4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <?php echo $hesklang['search_logs']; ?>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['search_logs']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body">
+            <div class="form-horizontal">
+                <div class="form-group">
+                    <label for="location" class="control-label col-sm-4">
+                        <?php echo $hesklang['custom_place']; ?>
+                    </label>
+                    <div class="col-sm-8">
+                        <input type="text" name="location" class="form-control" placeholder="<?php echo hesk_htmlspecialchars($hesklang['custom_place']); ?>">
+                    </div>
                 </div>
-                <div class="panel-body">
-                    <div class="form-horizontal">
-                        <div class="form-group">
-                            <label for="location" class="control-label col-sm-4">
-                                <?php echo $hesklang['custom_place']; ?>
-                            </label>
-                            <div class="col-sm-8">
-                                <input type="text" name="location" class="form-control" placeholder="<?php echo hesk_htmlspecialchars($hesklang['custom_place']); ?>">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="date" class="control-label col-sm-4">
-                                <?php echo $hesklang['date_logged']; ?>
-                            </label>
-                            <div class="col-sm-8">
-                                <input type="text" name="from-date" class="datepicker form-control white-readonly no-bottom-round-corners no-bottom-border" placeholder="<?php echo hesk_htmlspecialchars($hesklang['from_date']); ?>" readonly>
-                                <input type="text" name="to-date" class="datepicker form-control white-readonly no-top-round-corners" placeholder="<?php echo hesk_htmlspecialchars($hesklang['to_date']); ?>" readonly>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="severity" class="control-label col-sm-4"><?php echo $hesklang['severity']; ?></label>
-                            <div class="col-sm-8">
-                                <select name="severity" class="form-control">
-                                    <option value="-1" selected><?php echo $hesklang['all']; ?></option>
-                                    <option value="0"><?php echo $hesklang['debug']; ?></option>
-                                    <option value="1"><?php echo $hesklang['info']; ?></option>
-                                    <option value="2"><?php echo $hesklang['warning_title_case']; ?></option>
-                                    <option value="3"><?php echo $hesklang['sm_error']; ?></option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-sm-8 col-sm-offset-4">
-                                <button class="btn btn-default" id="search-button"><?php echo $hesklang['search']; ?></button>
-                            </div>
-                        </div>
+                <div class="form-group">
+                    <label for="date" class="control-label col-sm-4">
+                        <?php echo $hesklang['date_logged']; ?>
+                    </label>
+                    <div class="col-sm-8">
+                        <input type="text" name="from-date" class="datepicker form-control white-readonly no-bottom-round-corners no-bottom-border" placeholder="<?php echo hesk_htmlspecialchars($hesklang['from_date']); ?>" readonly>
+                        <input type="text" name="to-date" class="datepicker form-control white-readonly no-top-round-corners" placeholder="<?php echo hesk_htmlspecialchars($hesklang['to_date']); ?>" readonly>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="severity" class="control-label col-sm-4"><?php echo $hesklang['severity']; ?></label>
+                    <div class="col-sm-8">
+                        <select name="severity" class="form-control">
+                            <option value="-1" selected><?php echo $hesklang['all']; ?></option>
+                            <option value="0"><?php echo $hesklang['debug']; ?></option>
+                            <option value="1"><?php echo $hesklang['info']; ?></option>
+                            <option value="2"><?php echo $hesklang['warning_title_case']; ?></option>
+                            <option value="3"><?php echo $hesklang['sm_error']; ?></option>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-8 col-sm-offset-4">
+                        <button class="btn btn-default" id="search-button"><?php echo $hesklang['search']; ?></button>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="col-sm-8">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <?php echo $hesklang['logs']; ?>
-                </div>
-                <div class="panel-body">
-                    <table class="table table-striped" id="results-table">
-                        <thead>
-                        <tr>
-                            <th><?php echo $hesklang['date']; ?></th>
-                            <th><?php echo $hesklang['user']; ?></th>
-                            <th><?php echo $hesklang['custom_place']; ?></th>
-                            <th><?php echo $hesklang['message']; ?></th>
-                        </tr>
-                        </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
+    </div>
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
+                <?php echo $hesklang['logs']; ?>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
         </div>
+        <div class="box-body">
+            <table class="table table-striped" id="results-table">
+                <thead>
+                <tr>
+                    <th><?php echo $hesklang['date']; ?></th>
+                    <th><?php echo $hesklang['user']; ?></th>
+                    <th><?php echo $hesklang['custom_place']; ?></th>
+                    <th><?php echo $hesklang['message']; ?></th>
+                </tr>
+                </thead>
+                <tbody></tbody>
+            </table>
+        </div>
     </div>
-
+</section>
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
 exit();
\ No newline at end of file
diff --git a/css/AdminLTE.min.css b/css/AdminLTE.min.css
new file mode 100755
index 00000000..00d622f1
--- /dev/null
+++ b/css/AdminLTE.min.css
@@ -0,0 +1,7 @@
+@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);/*!
+ *   AdminLTE v2.3.5
+ *   Author: Almsaeed Studio
+ *	 Website: Almsaeed Studio <http://almsaeedstudio.com>
+ *   License: Open source - MIT
+ *           Please visit http://opensource.org/licenses/MIT for more information
+!*/html,body{min-height:100%}.layout-boxed html,.layout-boxed body{height:100%}body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;overflow-x:hidden;overflow-y:auto}.wrapper{min-height:100%;position:relative;overflow:hidden}.wrapper:before,.wrapper:after{content:" ";display:table}.wrapper:after{clear:both}.layout-boxed .wrapper{max-width:1250px;margin:0 auto;min-height:100%;box-shadow:0 0 8px rgba(0,0,0,0.5);position:relative}.layout-boxed{background:url('../img/boxed-bg.jpg') repeat fixed}.content-wrapper,.right-side,.main-footer{-webkit-transition:-webkit-transform .3s ease-in-out,margin .3s ease-in-out;-moz-transition:-moz-transform .3s ease-in-out,margin .3s ease-in-out;-o-transition:-o-transform .3s ease-in-out,margin .3s ease-in-out;transition:transform .3s ease-in-out,margin .3s ease-in-out;margin-left:230px;z-index:820}.layout-top-nav .content-wrapper,.layout-top-nav .right-side,.layout-top-nav .main-footer{margin-left:0}@media (max-width:767px){.content-wrapper,.right-side,.main-footer{margin-left:0}}@media (min-width:768px){.sidebar-collapse .content-wrapper,.sidebar-collapse .right-side,.sidebar-collapse .main-footer{margin-left:0}}@media (max-width:767px){.sidebar-open .content-wrapper,.sidebar-open .right-side,.sidebar-open .main-footer{-webkit-transform:translate(230px, 0);-ms-transform:translate(230px, 0);-o-transform:translate(230px, 0);transform:translate(230px, 0)}}.content-wrapper,.right-side{min-height:100%;background-color:#ecf0f5;z-index:800}.main-footer{background:#fff;padding:15px;color:#444;border-top:1px solid #d2d6de}.fixed .main-header,.fixed .main-sidebar,.fixed .left-side{position:fixed}.fixed .main-header{top:0;right:0;left:0}.fixed .content-wrapper,.fixed .right-side{padding-top:50px}@media (max-width:767px){.fixed .content-wrapper,.fixed .right-side{padding-top:100px}}.fixed.layout-boxed .wrapper{max-width:100%}body.hold-transition .content-wrapper,body.hold-transition .right-side,body.hold-transition .main-footer,body.hold-transition .main-sidebar,body.hold-transition .left-side,body.hold-transition .main-header .navbar,body.hold-transition .main-header .logo{-webkit-transition:none;-o-transition:none;transition:none}.content{min-height:250px;padding:15px;margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:'Source Sans Pro',sans-serif}a{color:#3c8dbc}a:hover,a:active,a:focus{outline:none;text-decoration:none;color:#72afd2}.page-header{margin:10px 0 20px 0;font-size:22px}.page-header>small{color:#666;display:block;margin-top:5px}.main-header{position:relative;max-height:100px;z-index:1030}.main-header .navbar{-webkit-transition:margin-left .3s ease-in-out;-o-transition:margin-left .3s ease-in-out;transition:margin-left .3s ease-in-out;margin-bottom:0;margin-left:230px;border:none;min-height:50px;border-radius:0}.layout-top-nav .main-header .navbar{margin-left:0}.main-header #navbar-search-input.form-control{background:rgba(255,255,255,0.2);border-color:transparent}.main-header #navbar-search-input.form-control:focus,.main-header #navbar-search-input.form-control:active{border-color:rgba(0,0,0,0.1);background:rgba(255,255,255,0.9)}.main-header #navbar-search-input.form-control::-moz-placeholder{color:#ccc;opacity:1}.main-header #navbar-search-input.form-control:-ms-input-placeholder{color:#ccc}.main-header #navbar-search-input.form-control::-webkit-input-placeholder{color:#ccc}.main-header .navbar-custom-menu,.main-header .navbar-right{float:right}@media (max-width:991px){.main-header .navbar-custom-menu a,.main-header .navbar-right a{color:inherit;background:transparent}}@media (max-width:767px){.main-header .navbar-right{float:none}.navbar-collapse .main-header .navbar-right{margin:7.5px -15px}.main-header .navbar-right>li{color:inherit;border:0}}.main-header .sidebar-toggle{float:left;background-color:transparent;background-image:none;padding:15px 15px;font-family:fontAwesome}.main-header .sidebar-toggle:before{content:"\f0c9"}.main-header .sidebar-toggle:hover{color:#fff}.main-header .sidebar-toggle:focus,.main-header .sidebar-toggle:active{background:transparent}.main-header .sidebar-toggle .icon-bar{display:none}.main-header .navbar .nav>li.user>a>.fa,.main-header .navbar .nav>li.user>a>.glyphicon,.main-header .navbar .nav>li.user>a>.ion{margin-right:5px}.main-header .navbar .nav>li>a>.label{position:absolute;top:9px;right:7px;text-align:center;font-size:9px;padding:2px 3px;line-height:.9}.main-header .logo{-webkit-transition:width .3s ease-in-out;-o-transition:width .3s ease-in-out;transition:width .3s ease-in-out;display:block;float:left;height:50px;font-size:20px;line-height:50px;text-align:center;width:230px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;padding:0 15px;font-weight:300;overflow:hidden}.main-header .logo .logo-lg{display:block}.main-header .logo .logo-mini{display:none}.main-header .navbar-brand{color:#fff}.content-header{position:relative;padding:15px 15px 0 15px}.content-header>h1{margin:0;font-size:24px}.content-header>h1>small{font-size:15px;display:inline-block;padding-left:4px;font-weight:300}.content-header>.breadcrumb{float:right;background:transparent;margin-top:0;margin-bottom:0;font-size:12px;padding:7px 5px;position:absolute;top:15px;right:10px;border-radius:2px}.content-header>.breadcrumb>li>a{color:#444;text-decoration:none;display:inline-block}.content-header>.breadcrumb>li>a>.fa,.content-header>.breadcrumb>li>a>.glyphicon,.content-header>.breadcrumb>li>a>.ion{margin-right:5px}.content-header>.breadcrumb>li+li:before{content:'>\00a0'}@media (max-width:991px){.content-header>.breadcrumb{position:relative;margin-top:5px;top:0;right:0;float:none;background:#d2d6de;padding-left:10px}.content-header>.breadcrumb li:before{color:#97a0b3}}.navbar-toggle{color:#fff;border:0;margin:0;padding:15px 15px}@media (max-width:991px){.navbar-custom-menu .navbar-nav>li{float:left}.navbar-custom-menu .navbar-nav{margin:0;float:left}.navbar-custom-menu .navbar-nav>li>a{padding-top:15px;padding-bottom:15px;line-height:20px}}@media (max-width:767px){.main-header{position:relative}.main-header .logo,.main-header .navbar{width:100%;float:none}.main-header .navbar{margin:0}.main-header .navbar-custom-menu{float:right}}@media (max-width:991px){.navbar-collapse.pull-left{float:none !important}.navbar-collapse.pull-left+.navbar-custom-menu{display:block;position:absolute;top:0;right:40px}}.main-sidebar,.left-side{position:absolute;top:0;left:0;padding-top:50px;min-height:100%;width:230px;z-index:810;-webkit-transition:-webkit-transform .3s ease-in-out,width .3s ease-in-out;-moz-transition:-moz-transform .3s ease-in-out,width .3s ease-in-out;-o-transition:-o-transform .3s ease-in-out,width .3s ease-in-out;transition:transform .3s ease-in-out,width .3s ease-in-out}@media (max-width:767px){.main-sidebar,.left-side{padding-top:100px}}@media (max-width:767px){.main-sidebar,.left-side{-webkit-transform:translate(-230px, 0);-ms-transform:translate(-230px, 0);-o-transform:translate(-230px, 0);transform:translate(-230px, 0)}}@media (min-width:768px){.sidebar-collapse .main-sidebar,.sidebar-collapse .left-side{-webkit-transform:translate(-230px, 0);-ms-transform:translate(-230px, 0);-o-transform:translate(-230px, 0);transform:translate(-230px, 0)}}@media (max-width:767px){.sidebar-open .main-sidebar,.sidebar-open .left-side{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0)}}.sidebar{padding-bottom:10px}.sidebar-form input:focus{border-color:transparent}.user-panel{position:relative;width:100%;padding:10px;overflow:hidden}.user-panel:before,.user-panel:after{content:" ";display:table}.user-panel:after{clear:both}.user-panel>.image>img{width:100%;max-width:45px;height:auto}.user-panel>.info{padding:5px 5px 5px 15px;line-height:1;position:absolute;left:55px}.user-panel>.info>p{font-weight:600;margin-bottom:9px}.user-panel>.info>a{text-decoration:none;padding-right:5px;margin-top:3px;font-size:11px}.user-panel>.info>a>.fa,.user-panel>.info>a>.ion,.user-panel>.info>a>.glyphicon{margin-right:3px}.sidebar-menu{list-style:none;margin:0;padding:0}.sidebar-menu>li{position:relative;margin:0;padding:0}.sidebar-menu>li>a{padding:12px 5px 12px 15px;display:block}.sidebar-menu>li>a>.fa,.sidebar-menu>li>a>.glyphicon,.sidebar-menu>li>a>.ion{width:20px}.sidebar-menu>li .label,.sidebar-menu>li .badge{margin-right:5px}.sidebar-menu>li .badge{margin-top:3px}.sidebar-menu li.header{padding:10px 25px 10px 15px;font-size:12px}.sidebar-menu li>a>.pull-right-container>.fa-angle-left{width:auto;height:auto;padding:0;margin-right:10px}.sidebar-menu li.active>a>.pull-right-container>.fa-angle-left{-webkit-transform:rotate(-90deg);-ms-transform:rotate(-90deg);-o-transform:rotate(-90deg);transform:rotate(-90deg)}.sidebar-menu li.active>.treeview-menu{display:block}.sidebar-menu .treeview-menu{display:none;list-style:none;padding:0;margin:0;padding-left:5px}.sidebar-menu .treeview-menu .treeview-menu{padding-left:20px}.sidebar-menu .treeview-menu>li{margin:0}.sidebar-menu .treeview-menu>li>a{padding:5px 5px 5px 15px;display:block;font-size:14px}.sidebar-menu .treeview-menu>li>a>.fa,.sidebar-menu .treeview-menu>li>a>.glyphicon,.sidebar-menu .treeview-menu>li>a>.ion{width:20px}.sidebar-menu .treeview-menu>li>a>.pull-right-container>.fa-angle-left,.sidebar-menu .treeview-menu>li>a>.fa-angle-down{width:auto}@media (min-width:768px){.sidebar-mini.sidebar-collapse .content-wrapper,.sidebar-mini.sidebar-collapse .right-side,.sidebar-mini.sidebar-collapse .main-footer{margin-left:50px !important;z-index:840}.sidebar-mini.sidebar-collapse .main-sidebar{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);width:50px !important;z-index:850}.sidebar-mini.sidebar-collapse .sidebar-menu>li{position:relative}.sidebar-mini.sidebar-collapse .sidebar-menu>li>a{margin-right:0}.sidebar-mini.sidebar-collapse .sidebar-menu>li>a>span{border-top-right-radius:4px}.sidebar-mini.sidebar-collapse .sidebar-menu>li:not(.treeview)>a>span{border-bottom-right-radius:4px}.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{padding-top:5px;padding-bottom:5px;border-bottom-right-radius:4px}.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>a>span:not(.pull-right),.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>.treeview-menu{display:block !important;position:absolute;width:180px;left:50px}.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>a>span{top:0;margin-left:-3px;padding:12px 5px 12px 20px;background-color:inherit}.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>a>.pull-right-container{float:right;width:auto!important;left:200px!important;top:10px!important}.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>a>.pull-right-container>.label:not(:first-of-type){display:none}.sidebar-mini.sidebar-collapse .sidebar-menu>li:hover>.treeview-menu{top:44px;margin-left:0}.sidebar-mini.sidebar-collapse .main-sidebar .user-panel>.info,.sidebar-mini.sidebar-collapse .sidebar-form,.sidebar-mini.sidebar-collapse .sidebar-menu>li>a>span,.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu,.sidebar-mini.sidebar-collapse .sidebar-menu>li>a>.pull-right,.sidebar-mini.sidebar-collapse .sidebar-menu li.header{display:none !important;-webkit-transform:translateZ(0)}.sidebar-mini.sidebar-collapse .main-header .logo{width:50px}.sidebar-mini.sidebar-collapse .main-header .logo>.logo-mini{display:block;margin-left:-15px;margin-right:-15px;font-size:18px}.sidebar-mini.sidebar-collapse .main-header .logo>.logo-lg{display:none}.sidebar-mini.sidebar-collapse .main-header .navbar{margin-left:50px}}.sidebar-menu,.main-sidebar .user-panel,.sidebar-menu>li.header{white-space:nowrap;overflow:hidden}.sidebar-menu:hover{overflow:visible}.sidebar-form,.sidebar-menu>li.header{overflow:hidden;text-overflow:clip}.sidebar-menu li>a{position:relative}.sidebar-menu li>a>.pull-right-container{position:absolute;right:10px;top:50%;margin-top:-7px}.control-sidebar-bg{position:fixed;z-index:1000;bottom:0}.control-sidebar-bg,.control-sidebar{top:0;right:-230px;width:230px;-webkit-transition:right .3s ease-in-out;-o-transition:right .3s ease-in-out;transition:right .3s ease-in-out}.control-sidebar{position:absolute;padding-top:50px;z-index:1010}@media (max-width:768px){.control-sidebar{padding-top:100px}}.control-sidebar>.tab-content{padding:10px 15px}.control-sidebar.control-sidebar-open,.control-sidebar.control-sidebar-open+.control-sidebar-bg{right:0}.control-sidebar-open .control-sidebar-bg,.control-sidebar-open .control-sidebar{right:0}@media (min-width:768px){.control-sidebar-open .content-wrapper,.control-sidebar-open .right-side,.control-sidebar-open .main-footer{margin-right:230px}}.nav-tabs.control-sidebar-tabs>li:first-of-type>a,.nav-tabs.control-sidebar-tabs>li:first-of-type>a:hover,.nav-tabs.control-sidebar-tabs>li:first-of-type>a:focus{border-left-width:0}.nav-tabs.control-sidebar-tabs>li>a{border-radius:0}.nav-tabs.control-sidebar-tabs>li>a,.nav-tabs.control-sidebar-tabs>li>a:hover{border-top:none;border-right:none;border-left:1px solid transparent;border-bottom:1px solid transparent}.nav-tabs.control-sidebar-tabs>li>a .icon{font-size:16px}.nav-tabs.control-sidebar-tabs>li.active>a,.nav-tabs.control-sidebar-tabs>li.active>a:hover,.nav-tabs.control-sidebar-tabs>li.active>a:focus,.nav-tabs.control-sidebar-tabs>li.active>a:active{border-top:none;border-right:none;border-bottom:none}@media (max-width:768px){.nav-tabs.control-sidebar-tabs{display:table}.nav-tabs.control-sidebar-tabs>li{display:table-cell}}.control-sidebar-heading{font-weight:400;font-size:16px;padding:10px 0;margin-bottom:10px}.control-sidebar-subheading{display:block;font-weight:400;font-size:14px}.control-sidebar-menu{list-style:none;padding:0;margin:0 -15px}.control-sidebar-menu>li>a{display:block;padding:10px 15px}.control-sidebar-menu>li>a:before,.control-sidebar-menu>li>a:after{content:" ";display:table}.control-sidebar-menu>li>a:after{clear:both}.control-sidebar-menu>li>a>.control-sidebar-subheading{margin-top:0}.control-sidebar-menu .menu-icon{float:left;width:35px;height:35px;border-radius:50%;text-align:center;line-height:35px}.control-sidebar-menu .menu-info{margin-left:45px;margin-top:3px}.control-sidebar-menu .menu-info>.control-sidebar-subheading{margin:0}.control-sidebar-menu .menu-info>p{margin:0;font-size:11px}.control-sidebar-menu .progress{margin:0}.control-sidebar-dark{color:#b8c7ce}.control-sidebar-dark,.control-sidebar-dark+.control-sidebar-bg{background:#222d32}.control-sidebar-dark .nav-tabs.control-sidebar-tabs{border-bottom:#1c2529}.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a{background:#181f23;color:#b8c7ce}.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:hover,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:focus{border-left-color:#141a1d;border-bottom-color:#141a1d}.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:hover,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:focus,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:active{background:#1c2529}.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li>a:hover{color:#fff}.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li.active>a,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li.active>a:hover,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li.active>a:focus,.control-sidebar-dark .nav-tabs.control-sidebar-tabs>li.active>a:active{background:#222d32;color:#fff}.control-sidebar-dark .control-sidebar-heading,.control-sidebar-dark .control-sidebar-subheading{color:#fff}.control-sidebar-dark .control-sidebar-menu>li>a:hover{background:#1e282c}.control-sidebar-dark .control-sidebar-menu>li>a .menu-info>p{color:#b8c7ce}.control-sidebar-light{color:#5e5e5e}.control-sidebar-light,.control-sidebar-light+.control-sidebar-bg{background:#f9fafc;border-left:1px solid #d2d6de}.control-sidebar-light .nav-tabs.control-sidebar-tabs{border-bottom:#d2d6de}.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a{background:#e8ecf4;color:#444}.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a:hover,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a:focus{border-left-color:#d2d6de;border-bottom-color:#d2d6de}.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a:hover,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a:focus,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li>a:active{background:#eff1f7}.control-sidebar-light .nav-tabs.control-sidebar-tabs>li.active>a,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li.active>a:hover,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li.active>a:focus,.control-sidebar-light .nav-tabs.control-sidebar-tabs>li.active>a:active{background:#f9fafc;color:#111}.control-sidebar-light .control-sidebar-heading,.control-sidebar-light .control-sidebar-subheading{color:#111}.control-sidebar-light .control-sidebar-menu{margin-left:-14px}.control-sidebar-light .control-sidebar-menu>li>a:hover{background:#f4f4f5}.control-sidebar-light .control-sidebar-menu>li>a .menu-info>p{color:#5e5e5e}.dropdown-menu{box-shadow:none;border-color:#eee}.dropdown-menu>li>a{color:#777}.dropdown-menu>li>a>.glyphicon,.dropdown-menu>li>a>.fa,.dropdown-menu>li>a>.ion{margin-right:10px}.dropdown-menu>li>a:hover{background-color:#e1e3e9;color:#333}.dropdown-menu>.divider{background-color:#eee}.navbar-nav>.notifications-menu>.dropdown-menu,.navbar-nav>.messages-menu>.dropdown-menu,.navbar-nav>.tasks-menu>.dropdown-menu{width:280px;padding:0 0 0 0;margin:0;top:100%}.navbar-nav>.notifications-menu>.dropdown-menu>li,.navbar-nav>.messages-menu>.dropdown-menu>li,.navbar-nav>.tasks-menu>.dropdown-menu>li{position:relative}.navbar-nav>.notifications-menu>.dropdown-menu>li.header,.navbar-nav>.messages-menu>.dropdown-menu>li.header,.navbar-nav>.tasks-menu>.dropdown-menu>li.header{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0;background-color:#ffffff;padding:7px 10px;border-bottom:1px solid #f4f4f4;color:#444444;font-size:14px}.navbar-nav>.notifications-menu>.dropdown-menu>li.footer>a,.navbar-nav>.messages-menu>.dropdown-menu>li.footer>a,.navbar-nav>.tasks-menu>.dropdown-menu>li.footer>a{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px;font-size:12px;background-color:#fff;padding:7px 10px;border-bottom:1px solid #eeeeee;color:#444 !important;text-align:center}@media (max-width:991px){.navbar-nav>.notifications-menu>.dropdown-menu>li.footer>a,.navbar-nav>.messages-menu>.dropdown-menu>li.footer>a,.navbar-nav>.tasks-menu>.dropdown-menu>li.footer>a{background:#fff !important;color:#444 !important}}.navbar-nav>.notifications-menu>.dropdown-menu>li.footer>a:hover,.navbar-nav>.messages-menu>.dropdown-menu>li.footer>a:hover,.navbar-nav>.tasks-menu>.dropdown-menu>li.footer>a:hover{text-decoration:none;font-weight:normal}.navbar-nav>.notifications-menu>.dropdown-menu>li .menu,.navbar-nav>.messages-menu>.dropdown-menu>li .menu,.navbar-nav>.tasks-menu>.dropdown-menu>li .menu{max-height:200px;margin:0;padding:0;list-style:none;overflow-x:hidden}.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a,.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a,.navbar-nav>.tasks-menu>.dropdown-menu>li .menu>li>a{display:block;white-space:nowrap;border-bottom:1px solid #f4f4f4}.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a:hover,.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a:hover,.navbar-nav>.tasks-menu>.dropdown-menu>li .menu>li>a:hover{background:#f4f4f4;text-decoration:none}.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a{color:#444444;overflow:hidden;text-overflow:ellipsis;padding:10px}.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a>.glyphicon,.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a>.fa,.navbar-nav>.notifications-menu>.dropdown-menu>li .menu>li>a>.ion{width:20px}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a{margin:0;padding:10px 10px}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>div>img{margin:auto 10px auto auto;width:40px;height:40px}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>h4{padding:0;margin:0 0 0 45px;color:#444444;font-size:15px;position:relative}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>h4>small{color:#999999;font-size:10px;position:absolute;top:0;right:0}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>p{margin:0 0 0 45px;font-size:12px;color:#888888}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a:before,.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a:after{content:" ";display:table}.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a:after{clear:both}.navbar-nav>.tasks-menu>.dropdown-menu>li .menu>li>a{padding:10px}.navbar-nav>.tasks-menu>.dropdown-menu>li .menu>li>a>h3{font-size:14px;padding:0;margin:0 0 10px 0;color:#666666}.navbar-nav>.tasks-menu>.dropdown-menu>li .menu>li>a>.progress{padding:0;margin:0}.navbar-nav>.user-menu>.dropdown-menu{border-top-right-radius:0;border-top-left-radius:0;padding:1px 0 0 0;border-top-width:0;width:280px}.navbar-nav>.user-menu>.dropdown-menu,.navbar-nav>.user-menu>.dropdown-menu>.user-body{border-bottom-right-radius:4px;border-bottom-left-radius:4px}.navbar-nav>.user-menu>.dropdown-menu>li.user-header{height:175px;padding:10px;text-align:center}.navbar-nav>.user-menu>.dropdown-menu>li.user-header>img{z-index:5;height:90px;width:90px;border:3px solid;border-color:transparent;border-color:rgba(255,255,255,0.2)}.navbar-nav>.user-menu>.dropdown-menu>li.user-header>p{z-index:5;color:#fff;color:rgba(255,255,255,0.8);font-size:17px;margin-top:10px}.navbar-nav>.user-menu>.dropdown-menu>li.user-header>p>small{display:block;font-size:12px}.navbar-nav>.user-menu>.dropdown-menu>.user-body{padding:15px;border-bottom:1px solid #f4f4f4;border-top:1px solid #dddddd}.navbar-nav>.user-menu>.dropdown-menu>.user-body:before,.navbar-nav>.user-menu>.dropdown-menu>.user-body:after{content:" ";display:table}.navbar-nav>.user-menu>.dropdown-menu>.user-body:after{clear:both}.navbar-nav>.user-menu>.dropdown-menu>.user-body a{color:#444 !important}@media (max-width:991px){.navbar-nav>.user-menu>.dropdown-menu>.user-body a{background:#fff !important;color:#444 !important}}.navbar-nav>.user-menu>.dropdown-menu>.user-footer{background-color:#f9f9f9;padding:10px}.navbar-nav>.user-menu>.dropdown-menu>.user-footer:before,.navbar-nav>.user-menu>.dropdown-menu>.user-footer:after{content:" ";display:table}.navbar-nav>.user-menu>.dropdown-menu>.user-footer:after{clear:both}.navbar-nav>.user-menu>.dropdown-menu>.user-footer .btn-default{color:#666666}@media (max-width:991px){.navbar-nav>.user-menu>.dropdown-menu>.user-footer .btn-default:hover{background-color:#f9f9f9}}.navbar-nav>.user-menu .user-image{float:left;width:25px;height:25px;border-radius:50%;margin-right:10px;margin-top:-2px}@media (max-width:767px){.navbar-nav>.user-menu .user-image{float:none;margin-right:0;margin-top:-8px;line-height:10px}}.open:not(.dropup)>.animated-dropdown-menu{backface-visibility:visible !important;-webkit-animation:flipInX .7s both;-o-animation:flipInX .7s both;animation:flipInX .7s both}@keyframes flipInX{0%{transform:perspective(400px) rotate3d(1, 0, 0, 90deg);transition-timing-function:ease-in;opacity:0}40%{transform:perspective(400px) rotate3d(1, 0, 0, -20deg);transition-timing-function:ease-in}60%{transform:perspective(400px) rotate3d(1, 0, 0, 10deg);opacity:1}80%{transform:perspective(400px) rotate3d(1, 0, 0, -5deg)}100%{transform:perspective(400px)}}@-webkit-keyframes flipInX{0%{-webkit-transform:perspective(400px) rotate3d(1, 0, 0, 90deg);-webkit-transition-timing-function:ease-in;opacity:0}40%{-webkit-transform:perspective(400px) rotate3d(1, 0, 0, -20deg);-webkit-transition-timing-function:ease-in}60%{-webkit-transform:perspective(400px) rotate3d(1, 0, 0, 10deg);opacity:1}80%{-webkit-transform:perspective(400px) rotate3d(1, 0, 0, -5deg)}100%{-webkit-transform:perspective(400px)}}.navbar-custom-menu>.navbar-nav>li{position:relative}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{position:absolute;right:0;left:auto}@media (max-width:991px){.navbar-custom-menu>.navbar-nav{float:right}.navbar-custom-menu>.navbar-nav>li{position:static}.navbar-custom-menu>.navbar-nav>li>.dropdown-menu{position:absolute;right:5%;left:auto;border:1px solid #ddd;background:#fff}}.form-control{border-radius:0;box-shadow:none;border-color:#d2d6de}.form-control:focus{border-color:#3c8dbc;box-shadow:none}.form-control::-moz-placeholder,.form-control:-ms-input-placeholder,.form-control::-webkit-input-placeholder{color:#bbb;opacity:1}.form-control:not(select){-webkit-appearance:none;-moz-appearance:none;appearance:none}.form-group.has-success label{color:#00a65a}.form-group.has-success .form-control{border-color:#00a65a;box-shadow:none}.form-group.has-success .help-block{color:#00a65a}.form-group.has-warning label{color:#f39c12}.form-group.has-warning .form-control{border-color:#f39c12;box-shadow:none}.form-group.has-warning .help-block{color:#f39c12}.form-group.has-error label{color:#dd4b39}.form-group.has-error .form-control{border-color:#dd4b39;box-shadow:none}.form-group.has-error .help-block{color:#dd4b39}.input-group .input-group-addon{border-radius:0;border-color:#d2d6de;background-color:#fff}.btn-group-vertical .btn.btn-flat:first-of-type,.btn-group-vertical .btn.btn-flat:last-of-type{border-radius:0}.icheck>label{padding-left:0}.form-control-feedback.fa{line-height:34px}.input-lg+.form-control-feedback.fa,.input-group-lg+.form-control-feedback.fa,.form-group-lg .form-control+.form-control-feedback.fa{line-height:46px}.input-sm+.form-control-feedback.fa,.input-group-sm+.form-control-feedback.fa,.form-group-sm .form-control+.form-control-feedback.fa{line-height:30px}.progress,.progress>.progress-bar{-webkit-box-shadow:none;box-shadow:none}.progress,.progress>.progress-bar,.progress .progress-bar,.progress>.progress-bar .progress-bar{border-radius:1px}.progress.sm,.progress-sm{height:10px}.progress.sm,.progress-sm,.progress.sm .progress-bar,.progress-sm .progress-bar{border-radius:1px}.progress.xs,.progress-xs{height:7px}.progress.xs,.progress-xs,.progress.xs .progress-bar,.progress-xs .progress-bar{border-radius:1px}.progress.xxs,.progress-xxs{height:3px}.progress.xxs,.progress-xxs,.progress.xxs .progress-bar,.progress-xxs .progress-bar{border-radius:1px}.progress.vertical{position:relative;width:30px;height:200px;display:inline-block;margin-right:10px}.progress.vertical>.progress-bar{width:100%;position:absolute;bottom:0}.progress.vertical.sm,.progress.vertical.progress-sm{width:20px}.progress.vertical.xs,.progress.vertical.progress-xs{width:10px}.progress.vertical.xxs,.progress.vertical.progress-xxs{width:3px}.progress-group .progress-text{font-weight:600}.progress-group .progress-number{float:right}.table tr>td .progress{margin:0}.progress-bar-light-blue,.progress-bar-primary{background-color:#3c8dbc}.progress-striped .progress-bar-light-blue,.progress-striped .progress-bar-primary{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-green,.progress-bar-success{background-color:#00a65a}.progress-striped .progress-bar-green,.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-aqua,.progress-bar-info{background-color:#00c0ef}.progress-striped .progress-bar-aqua,.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-yellow,.progress-bar-warning{background-color:#f39c12}.progress-striped .progress-bar-yellow,.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-red,.progress-bar-danger{background-color:#dd4b39}.progress-striped .progress-bar-red,.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.small-box{border-radius:2px;position:relative;display:block;margin-bottom:20px;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.small-box>.inner{padding:10px}.small-box>.small-box-footer{position:relative;text-align:center;padding:3px 0;color:#fff;color:rgba(255,255,255,0.8);display:block;z-index:10;background:rgba(0,0,0,0.1);text-decoration:none}.small-box>.small-box-footer:hover{color:#fff;background:rgba(0,0,0,0.15)}.small-box h3{font-size:38px;font-weight:bold;margin:0 0 10px 0;white-space:nowrap;padding:0}.small-box p{font-size:15px}.small-box p>small{display:block;color:#f9f9f9;font-size:13px;margin-top:5px}.small-box h3,.small-box p{z-index:5}.small-box .icon{-webkit-transition:all .3s linear;-o-transition:all .3s linear;transition:all .3s linear;position:absolute;top:-10px;right:10px;z-index:0;font-size:90px;color:rgba(0,0,0,0.15)}.small-box:hover{text-decoration:none;color:#f9f9f9}.small-box:hover .icon{font-size:95px}@media (max-width:767px){.small-box{text-align:center}.small-box .icon{display:none}.small-box p{font-size:12px}}.box{position:relative;border-radius:3px;background:#ffffff;border-top:3px solid #d2d6de;margin-bottom:20px;width:100%;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.box.box-primary{border-top-color:#3c8dbc}.box.box-info{border-top-color:#00c0ef}.box.box-danger{border-top-color:#dd4b39}.box.box-warning{border-top-color:#f39c12}.box.box-success{border-top-color:#00a65a}.box.box-default{border-top-color:#d2d6de}.box.collapsed-box .box-body,.box.collapsed-box .box-footer{display:none}.box .nav-stacked>li{border-bottom:1px solid #f4f4f4;margin:0}.box .nav-stacked>li:last-of-type{border-bottom:none}.box.height-control .box-body{max-height:300px;overflow:auto}.box .border-right{border-right:1px solid #f4f4f4}.box .border-left{border-left:1px solid #f4f4f4}.box.box-solid{border-top:0}.box.box-solid>.box-header .btn.btn-default{background:transparent}.box.box-solid>.box-header .btn:hover,.box.box-solid>.box-header a:hover{background:rgba(0,0,0,0.1)}.box.box-solid.box-default{border:1px solid #d2d6de}.box.box-solid.box-default>.box-header{color:#444;background:#d2d6de;background-color:#d2d6de}.box.box-solid.box-default>.box-header a,.box.box-solid.box-default>.box-header .btn{color:#444}.box.box-solid.box-primary{border:1px solid #3c8dbc}.box.box-solid.box-primary>.box-header{color:#fff;background:#3c8dbc;background-color:#3c8dbc}.box.box-solid.box-primary>.box-header a,.box.box-solid.box-primary>.box-header .btn{color:#fff}.box.box-solid.box-info{border:1px solid #00c0ef}.box.box-solid.box-info>.box-header{color:#fff;background:#00c0ef;background-color:#00c0ef}.box.box-solid.box-info>.box-header a,.box.box-solid.box-info>.box-header .btn{color:#fff}.box.box-solid.box-danger{border:1px solid #dd4b39}.box.box-solid.box-danger>.box-header{color:#fff;background:#dd4b39;background-color:#dd4b39}.box.box-solid.box-danger>.box-header a,.box.box-solid.box-danger>.box-header .btn{color:#fff}.box.box-solid.box-warning{border:1px solid #f39c12}.box.box-solid.box-warning>.box-header{color:#fff;background:#f39c12;background-color:#f39c12}.box.box-solid.box-warning>.box-header a,.box.box-solid.box-warning>.box-header .btn{color:#fff}.box.box-solid.box-success{border:1px solid #00a65a}.box.box-solid.box-success>.box-header{color:#fff;background:#00a65a;background-color:#00a65a}.box.box-solid.box-success>.box-header a,.box.box-solid.box-success>.box-header .btn{color:#fff}.box.box-solid>.box-header>.box-tools .btn{border:0;box-shadow:none}.box.box-solid[class*='bg']>.box-header{color:#fff}.box .box-group>.box{margin-bottom:5px}.box .knob-label{text-align:center;color:#333;font-weight:100;font-size:12px;margin-bottom:0.3em}.box>.overlay,.overlay-wrapper>.overlay,.box>.loading-img,.overlay-wrapper>.loading-img{position:absolute;top:0;left:0;width:100%;height:100%}.box .overlay,.overlay-wrapper .overlay{z-index:50;background:rgba(255,255,255,0.7);border-radius:3px}.box .overlay>.fa,.overlay-wrapper .overlay>.fa{position:absolute;top:50%;left:50%;margin-left:-15px;margin-top:-15px;color:#000;font-size:30px}.box .overlay.dark,.overlay-wrapper .overlay.dark{background:rgba(0,0,0,0.5)}.box-header:before,.box-body:before,.box-footer:before,.box-header:after,.box-body:after,.box-footer:after{content:" ";display:table}.box-header:after,.box-body:after,.box-footer:after{clear:both}.box-header{color:#444;display:block;padding:10px;position:relative}.box-header.with-border{border-bottom:1px solid #f4f4f4}.collapsed-box .box-header.with-border{border-bottom:none}.box-header>.fa,.box-header>.glyphicon,.box-header>.ion,.box-header .box-title{display:inline-block;font-size:18px;margin:0;line-height:1}.box-header>.fa,.box-header>.glyphicon,.box-header>.ion{margin-right:5px}.box-header>.box-tools{position:absolute;right:10px;top:5px}.box-header>.box-tools [data-toggle="tooltip"]{position:relative}.box-header>.box-tools.pull-right .dropdown-menu{right:0;left:auto}.btn-box-tool{padding:5px;font-size:12px;background:transparent;color:#97a0b3}.open .btn-box-tool,.btn-box-tool:hover{color:#606c84}.btn-box-tool.btn:active{box-shadow:none}.box-body{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px;padding:10px}.no-header .box-body{border-top-right-radius:3px;border-top-left-radius:3px}.box-body>.table{margin-bottom:0}.box-body .fc{margin-top:5px}.box-body .full-width-chart{margin:-19px}.box-body.no-padding .full-width-chart{margin:-9px}.box-body .box-pane{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:3px}.box-body .box-pane-right{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:0}.box-footer{border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px;border-top:1px solid #f4f4f4;padding:10px;background-color:#fff}.chart-legend{margin:10px 0}@media (max-width:991px){.chart-legend>li{float:left;margin-right:10px}}.box-comments{background:#f7f7f7}.box-comments .box-comment{padding:8px 0;border-bottom:1px solid #eee}.box-comments .box-comment:before,.box-comments .box-comment:after{content:" ";display:table}.box-comments .box-comment:after{clear:both}.box-comments .box-comment:last-of-type{border-bottom:0}.box-comments .box-comment:first-of-type{padding-top:0}.box-comments .box-comment img{float:left}.box-comments .comment-text{margin-left:40px;color:#555}.box-comments .username{color:#444;display:block;font-weight:600}.box-comments .text-muted{font-weight:400;font-size:12px}.todo-list{margin:0;padding:0;list-style:none;overflow:auto}.todo-list>li{border-radius:2px;padding:10px;background:#f4f4f4;margin-bottom:2px;border-left:2px solid #e6e7e8;color:#444}.todo-list>li:last-of-type{margin-bottom:0}.todo-list>li>input[type='checkbox']{margin:0 10px 0 5px}.todo-list>li .text{display:inline-block;margin-left:5px;font-weight:600}.todo-list>li .label{margin-left:10px;font-size:9px}.todo-list>li .tools{display:none;float:right;color:#dd4b39}.todo-list>li .tools>.fa,.todo-list>li .tools>.glyphicon,.todo-list>li .tools>.ion{margin-right:5px;cursor:pointer}.todo-list>li:hover .tools{display:inline-block}.todo-list>li.done{color:#999}.todo-list>li.done .text{text-decoration:line-through;font-weight:500}.todo-list>li.done .label{background:#d2d6de !important}.todo-list .danger{border-left-color:#dd4b39}.todo-list .warning{border-left-color:#f39c12}.todo-list .info{border-left-color:#00c0ef}.todo-list .success{border-left-color:#00a65a}.todo-list .primary{border-left-color:#3c8dbc}.todo-list .handle{display:inline-block;cursor:move;margin:0 5px}.chat{padding:5px 20px 5px 10px}.chat .item{margin-bottom:10px}.chat .item:before,.chat .item:after{content:" ";display:table}.chat .item:after{clear:both}.chat .item>img{width:40px;height:40px;border:2px solid transparent;border-radius:50%}.chat .item>.online{border:2px solid #00a65a}.chat .item>.offline{border:2px solid #dd4b39}.chat .item>.message{margin-left:55px;margin-top:-40px}.chat .item>.message>.name{display:block;font-weight:600}.chat .item>.attachment{border-radius:3px;background:#f4f4f4;margin-left:65px;margin-right:15px;padding:10px}.chat .item>.attachment>h4{margin:0 0 5px 0;font-weight:600;font-size:14px}.chat .item>.attachment>p,.chat .item>.attachment>.filename{font-weight:600;font-size:13px;font-style:italic;margin:0}.chat .item>.attachment:before,.chat .item>.attachment:after{content:" ";display:table}.chat .item>.attachment:after{clear:both}.box-input{max-width:200px}.modal .panel-body{color:#444}.info-box{display:block;min-height:90px;background:#fff;width:100%;box-shadow:0 1px 1px rgba(0,0,0,0.1);border-radius:2px;margin-bottom:15px}.info-box small{font-size:14px}.info-box .progress{background:rgba(0,0,0,0.2);margin:5px -10px 5px -10px;height:2px}.info-box .progress,.info-box .progress .progress-bar{border-radius:0}.info-box .progress .progress-bar{background:#fff}.info-box-icon{border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px;display:block;float:left;height:90px;width:90px;text-align:center;font-size:45px;line-height:90px;background:rgba(0,0,0,0.2)}.info-box-icon>img{max-width:100%}.info-box-content{padding:5px 10px;margin-left:90px}.info-box-number{display:block;font-weight:bold;font-size:18px}.progress-description,.info-box-text{display:block;font-size:14px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.info-box-text{text-transform:uppercase}.info-box-more{display:block}.progress-description{margin:0}.timeline{position:relative;margin:0 0 30px 0;padding:0;list-style:none}.timeline:before{content:'';position:absolute;top:0;bottom:0;width:4px;background:#ddd;left:31px;margin:0;border-radius:2px}.timeline>li{position:relative;margin-right:10px;margin-bottom:15px}.timeline>li:before,.timeline>li:after{content:" ";display:table}.timeline>li:after{clear:both}.timeline>li>.timeline-item{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.1);box-shadow:0 1px 1px rgba(0,0,0,0.1);border-radius:3px;margin-top:0;background:#fff;color:#444;margin-left:60px;margin-right:15px;padding:0;position:relative}.timeline>li>.timeline-item>.time{color:#999;float:right;padding:10px;font-size:12px}.timeline>li>.timeline-item>.timeline-header{margin:0;color:#555;border-bottom:1px solid #f4f4f4;padding:10px;font-size:16px;line-height:1.1}.timeline>li>.timeline-item>.timeline-header>a{font-weight:600}.timeline>li>.timeline-item>.timeline-body,.timeline>li>.timeline-item>.timeline-footer{padding:10px}.timeline>li>.fa,.timeline>li>.glyphicon,.timeline>li>.ion{width:30px;height:30px;font-size:15px;line-height:30px;position:absolute;color:#666;background:#d2d6de;border-radius:50%;text-align:center;left:18px;top:0}.timeline>.time-label>span{font-weight:600;padding:5px;display:inline-block;background-color:#fff;border-radius:4px}.timeline-inverse>li>.timeline-item{background:#f0f0f0;border:1px solid #ddd;-webkit-box-shadow:none;box-shadow:none}.timeline-inverse>li>.timeline-item>.timeline-header{border-bottom-color:#ddd}.btn{border-radius:3px;-webkit-box-shadow:none;box-shadow:none;border:1px solid transparent}.btn.uppercase{text-transform:uppercase}.btn.btn-flat{border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-width:1px}.btn:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:focus{outline:none}.btn.btn-file{position:relative;overflow:hidden}.btn.btn-file>input[type='file']{position:absolute;top:0;right:0;min-width:100%;min-height:100%;font-size:100px;text-align:right;opacity:0;filter:alpha(opacity=0);outline:none;background:white;cursor:inherit;display:block}.btn-default{background-color:#f4f4f4;color:#444;border-color:#ddd}.btn-default:hover,.btn-default:active,.btn-default.hover{background-color:#e7e7e7}.btn-primary{background-color:#3c8dbc;border-color:#367fa9}.btn-primary:hover,.btn-primary:active,.btn-primary.hover{background-color:#367fa9}.btn-success{background-color:#00a65a;border-color:#008d4c}.btn-success:hover,.btn-success:active,.btn-success.hover{background-color:#008d4c}.btn-info{background-color:#00c0ef;border-color:#00acd6}.btn-info:hover,.btn-info:active,.btn-info.hover{background-color:#00acd6}.btn-danger{background-color:#dd4b39;border-color:#d73925}.btn-danger:hover,.btn-danger:active,.btn-danger.hover{background-color:#d73925}.btn-warning{background-color:#f39c12;border-color:#e08e0b}.btn-warning:hover,.btn-warning:active,.btn-warning.hover{background-color:#e08e0b}.btn-outline{border:1px solid #fff;background:transparent;color:#fff}.btn-outline:hover,.btn-outline:focus,.btn-outline:active{color:rgba(255,255,255,0.7);border-color:rgba(255,255,255,0.7)}.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn[class*='bg-']:hover{-webkit-box-shadow:inset 0 0 100px rgba(0,0,0,0.2);box-shadow:inset 0 0 100px rgba(0,0,0,0.2)}.btn-app{border-radius:3px;position:relative;padding:15px 5px;margin:0 0 10px 10px;min-width:80px;height:60px;text-align:center;color:#666;border:1px solid #ddd;background-color:#f4f4f4;font-size:12px}.btn-app>.fa,.btn-app>.glyphicon,.btn-app>.ion{font-size:20px;display:block}.btn-app:hover{background:#f4f4f4;color:#444;border-color:#aaa}.btn-app:active,.btn-app:focus{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-app>.badge{position:absolute;top:-3px;right:-10px;font-size:10px;font-weight:400}.callout{border-radius:3px;margin:0 0 20px 0;padding:15px 30px 15px 15px;border-left:5px solid #eee}.callout a{color:#fff;text-decoration:underline}.callout a:hover{color:#eee}.callout h4{margin-top:0;font-weight:600}.callout p:last-child{margin-bottom:0}.callout code,.callout .highlight{background-color:#fff}.callout.callout-danger{border-color:#c23321}.callout.callout-warning{border-color:#c87f0a}.callout.callout-info{border-color:#0097bc}.callout.callout-success{border-color:#00733e}.alert{border-radius:3px}.alert h4{font-weight:600}.alert .icon{margin-right:10px}.alert .close{color:#000;opacity:.2;filter:alpha(opacity=20)}.alert .close:hover{opacity:.5;filter:alpha(opacity=50)}.alert a{color:#fff;text-decoration:underline}.alert-success{border-color:#008d4c}.alert-danger,.alert-error{border-color:#d73925}.alert-warning{border-color:#e08e0b}.alert-info{border-color:#00acd6}.nav>li>a:hover,.nav>li>a:active,.nav>li>a:focus{color:#444;background:#f7f7f7}.nav-pills>li>a{border-radius:0;border-top:3px solid transparent;color:#444}.nav-pills>li>a>.fa,.nav-pills>li>a>.glyphicon,.nav-pills>li>a>.ion{margin-right:5px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{border-top-color:#3c8dbc}.nav-pills>li.active>a{font-weight:600}.nav-stacked>li>a{border-radius:0;border-top:0;border-left:3px solid transparent;color:#444}.nav-stacked>li.active>a,.nav-stacked>li.active>a:hover{background:transparent;color:#444;border-top:0;border-left-color:#3c8dbc}.nav-stacked>li.header{border-bottom:1px solid #ddd;color:#777;margin-bottom:10px;padding:5px 10px;text-transform:uppercase}.nav-tabs-custom{margin-bottom:20px;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);border-radius:3px}.nav-tabs-custom>.nav-tabs{margin:0;border-bottom-color:#f4f4f4;border-top-right-radius:3px;border-top-left-radius:3px}.nav-tabs-custom>.nav-tabs>li{border-top:3px solid transparent;margin-bottom:-2px;margin-right:5px}.nav-tabs-custom>.nav-tabs>li>a{color:#444;border-radius:0}.nav-tabs-custom>.nav-tabs>li>a.text-muted{color:#999}.nav-tabs-custom>.nav-tabs>li>a,.nav-tabs-custom>.nav-tabs>li>a:hover{background:transparent;margin:0}.nav-tabs-custom>.nav-tabs>li>a:hover{color:#999}.nav-tabs-custom>.nav-tabs>li:not(.active)>a:hover,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:focus,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:active{border-color:transparent}.nav-tabs-custom>.nav-tabs>li.active{border-top-color:#3c8dbc}.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li.active:hover>a{background-color:#fff;color:#444}.nav-tabs-custom>.nav-tabs>li.active>a{border-top-color:transparent;border-left-color:#f4f4f4;border-right-color:#f4f4f4}.nav-tabs-custom>.nav-tabs>li:first-of-type{margin-left:0}.nav-tabs-custom>.nav-tabs>li:first-of-type.active>a{border-left-color:transparent}.nav-tabs-custom>.nav-tabs.pull-right{float:none !important}.nav-tabs-custom>.nav-tabs.pull-right>li{float:right}.nav-tabs-custom>.nav-tabs.pull-right>li:first-of-type{margin-right:0}.nav-tabs-custom>.nav-tabs.pull-right>li:first-of-type>a{border-left-width:1px}.nav-tabs-custom>.nav-tabs.pull-right>li:first-of-type.active>a{border-left-color:#f4f4f4;border-right-color:transparent}.nav-tabs-custom>.nav-tabs>li.header{line-height:35px;padding:0 10px;font-size:20px;color:#444}.nav-tabs-custom>.nav-tabs>li.header>.fa,.nav-tabs-custom>.nav-tabs>li.header>.glyphicon,.nav-tabs-custom>.nav-tabs>li.header>.ion{margin-right:5px}.nav-tabs-custom>.tab-content{background:#fff;padding:10px;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.nav-tabs-custom .dropdown.open>a:active,.nav-tabs-custom .dropdown.open>a:focus{background:transparent;color:#999}.nav-tabs-custom.tab-primary>.nav-tabs>li.active{border-top-color:#3c8dbc}.nav-tabs-custom.tab-info>.nav-tabs>li.active{border-top-color:#00c0ef}.nav-tabs-custom.tab-danger>.nav-tabs>li.active{border-top-color:#dd4b39}.nav-tabs-custom.tab-warning>.nav-tabs>li.active{border-top-color:#f39c12}.nav-tabs-custom.tab-success>.nav-tabs>li.active{border-top-color:#00a65a}.nav-tabs-custom.tab-default>.nav-tabs>li.active{border-top-color:#d2d6de}.pagination>li>a{background:#fafafa;color:#666}.pagination.pagination-flat>li>a{border-radius:0 !important}.products-list{list-style:none;margin:0;padding:0}.products-list>.item{border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.1);box-shadow:0 1px 1px rgba(0,0,0,0.1);padding:10px 0;background:#fff}.products-list>.item:before,.products-list>.item:after{content:" ";display:table}.products-list>.item:after{clear:both}.products-list .product-img{float:left}.products-list .product-img img{width:50px;height:50px}.products-list .product-info{margin-left:60px}.products-list .product-title{font-weight:600}.products-list .product-description{display:block;color:#999;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.product-list-in-box>.item{-webkit-box-shadow:none;box-shadow:none;border-radius:0;border-bottom:1px solid #f4f4f4}.product-list-in-box>.item:last-of-type{border-bottom-width:0}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{border-top:1px solid #f4f4f4}.table>thead>tr>th{border-bottom:2px solid #f4f4f4}.table tr td .progress{margin-top:5px}.table-bordered{border:1px solid #f4f4f4}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #f4f4f4}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table.no-border,.table.no-border td,.table.no-border th{border:0}table.text-center,table.text-center td,table.text-center th{text-align:center}.table.align th{text-align:left}.table.align td{text-align:right}.label-default{background-color:#d2d6de;color:#444}.direct-chat .box-body{border-bottom-right-radius:0;border-bottom-left-radius:0;position:relative;overflow-x:hidden;padding:0}.direct-chat.chat-pane-open .direct-chat-contacts{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0)}.direct-chat-messages{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);padding:10px;height:250px;overflow:auto}.direct-chat-msg,.direct-chat-text{display:block}.direct-chat-msg{margin-bottom:10px}.direct-chat-msg:before,.direct-chat-msg:after{content:" ";display:table}.direct-chat-msg:after{clear:both}.direct-chat-messages,.direct-chat-contacts{-webkit-transition:-webkit-transform .5s ease-in-out;-moz-transition:-moz-transform .5s ease-in-out;-o-transition:-o-transform .5s ease-in-out;transition:transform .5s ease-in-out}.direct-chat-text{border-radius:5px;position:relative;padding:5px 10px;background:#d2d6de;border:1px solid #d2d6de;margin:5px 0 0 50px;color:#444}.direct-chat-text:after,.direct-chat-text:before{position:absolute;right:100%;top:15px;border:solid transparent;border-right-color:#d2d6de;content:' ';height:0;width:0;pointer-events:none}.direct-chat-text:after{border-width:5px;margin-top:-5px}.direct-chat-text:before{border-width:6px;margin-top:-6px}.right .direct-chat-text{margin-right:50px;margin-left:0}.right .direct-chat-text:after,.right .direct-chat-text:before{right:auto;left:100%;border-right-color:transparent;border-left-color:#d2d6de}.direct-chat-img{border-radius:50%;float:left;width:40px;height:40px}.right .direct-chat-img{float:right}.direct-chat-info{display:block;margin-bottom:2px;font-size:12px}.direct-chat-name{font-weight:600}.direct-chat-timestamp{color:#999}.direct-chat-contacts-open .direct-chat-contacts{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0)}.direct-chat-contacts{-webkit-transform:translate(101%, 0);-ms-transform:translate(101%, 0);-o-transform:translate(101%, 0);transform:translate(101%, 0);position:absolute;top:0;bottom:0;height:250px;width:100%;background:#222d32;color:#fff;overflow:auto}.contacts-list>li{border-bottom:1px solid rgba(0,0,0,0.2);padding:10px;margin:0}.contacts-list>li:before,.contacts-list>li:after{content:" ";display:table}.contacts-list>li:after{clear:both}.contacts-list>li:last-of-type{border-bottom:none}.contacts-list-img{border-radius:50%;width:40px;float:left}.contacts-list-info{margin-left:45px;color:#fff}.contacts-list-name,.contacts-list-status{display:block}.contacts-list-name{font-weight:600}.contacts-list-status{font-size:12px}.contacts-list-date{color:#aaa;font-weight:normal}.contacts-list-msg{color:#999}.direct-chat-danger .right>.direct-chat-text{background:#dd4b39;border-color:#dd4b39;color:#fff}.direct-chat-danger .right>.direct-chat-text:after,.direct-chat-danger .right>.direct-chat-text:before{border-left-color:#dd4b39}.direct-chat-primary .right>.direct-chat-text{background:#3c8dbc;border-color:#3c8dbc;color:#fff}.direct-chat-primary .right>.direct-chat-text:after,.direct-chat-primary .right>.direct-chat-text:before{border-left-color:#3c8dbc}.direct-chat-warning .right>.direct-chat-text{background:#f39c12;border-color:#f39c12;color:#fff}.direct-chat-warning .right>.direct-chat-text:after,.direct-chat-warning .right>.direct-chat-text:before{border-left-color:#f39c12}.direct-chat-info .right>.direct-chat-text{background:#00c0ef;border-color:#00c0ef;color:#fff}.direct-chat-info .right>.direct-chat-text:after,.direct-chat-info .right>.direct-chat-text:before{border-left-color:#00c0ef}.direct-chat-success .right>.direct-chat-text{background:#00a65a;border-color:#00a65a;color:#fff}.direct-chat-success .right>.direct-chat-text:after,.direct-chat-success .right>.direct-chat-text:before{border-left-color:#00a65a}.users-list>li{width:25%;float:left;padding:10px;text-align:center}.users-list>li img{border-radius:50%;max-width:100%;height:auto}.users-list>li>a:hover,.users-list>li>a:hover .users-list-name{color:#999}.users-list-name,.users-list-date{display:block}.users-list-name{font-weight:600;color:#444;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.users-list-date{color:#999;font-size:12px}.carousel-control.left,.carousel-control.right{background-image:none}.carousel-control>.fa{font-size:40px;position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-20px}.modal{background:rgba(0,0,0,0.3)}.modal-content{border-radius:0;-webkit-box-shadow:0 2px 3px rgba(0,0,0,0.125);box-shadow:0 2px 3px rgba(0,0,0,0.125);border:0}@media (min-width:768px){.modal-content{-webkit-box-shadow:0 2px 3px rgba(0,0,0,0.125);box-shadow:0 2px 3px rgba(0,0,0,0.125)}}.modal-header{border-bottom-color:#f4f4f4}.modal-footer{border-top-color:#f4f4f4}.modal-primary .modal-header,.modal-primary .modal-footer{border-color:#307095}.modal-warning .modal-header,.modal-warning .modal-footer{border-color:#c87f0a}.modal-info .modal-header,.modal-info .modal-footer{border-color:#0097bc}.modal-success .modal-header,.modal-success .modal-footer{border-color:#00733e}.modal-danger .modal-header,.modal-danger .modal-footer{border-color:#c23321}.box-widget{border:none;position:relative}.widget-user .widget-user-header{padding:20px;height:120px;border-top-right-radius:3px;border-top-left-radius:3px}.widget-user .widget-user-username{margin-top:0;margin-bottom:5px;font-size:25px;font-weight:300;text-shadow:0 1px 1px rgba(0,0,0,0.2)}.widget-user .widget-user-desc{margin-top:0}.widget-user .widget-user-image{position:absolute;top:65px;left:50%;margin-left:-45px}.widget-user .widget-user-image>img{width:90px;height:auto;border:3px solid #fff}.widget-user .box-footer{padding-top:30px}.widget-user-2 .widget-user-header{padding:20px;border-top-right-radius:3px;border-top-left-radius:3px}.widget-user-2 .widget-user-username{margin-top:5px;margin-bottom:5px;font-size:25px;font-weight:300}.widget-user-2 .widget-user-desc{margin-top:0}.widget-user-2 .widget-user-username,.widget-user-2 .widget-user-desc{margin-left:75px}.widget-user-2 .widget-user-image>img{width:65px;height:auto;float:left}.mailbox-messages>.table{margin:0}.mailbox-controls{padding:5px}.mailbox-controls.with-border{border-bottom:1px solid #f4f4f4}.mailbox-read-info{border-bottom:1px solid #f4f4f4;padding:10px}.mailbox-read-info h3{font-size:20px;margin:0}.mailbox-read-info h5{margin:0;padding:5px 0 0 0}.mailbox-read-time{color:#999;font-size:13px}.mailbox-read-message{padding:10px}.mailbox-attachments li{float:left;width:200px;border:1px solid #eee;margin-bottom:10px;margin-right:10px}.mailbox-attachment-name{font-weight:bold;color:#666}.mailbox-attachment-icon,.mailbox-attachment-info,.mailbox-attachment-size{display:block}.mailbox-attachment-info{padding:10px;background:#f4f4f4}.mailbox-attachment-size{color:#999;font-size:12px}.mailbox-attachment-icon{text-align:center;font-size:65px;color:#666;padding:20px 10px}.mailbox-attachment-icon.has-img{padding:0}.mailbox-attachment-icon.has-img>img{max-width:100%;height:auto}.lockscreen{background:#d2d6de}.lockscreen-logo{font-size:35px;text-align:center;margin-bottom:25px;font-weight:300}.lockscreen-logo a{color:#444}.lockscreen-wrapper{max-width:400px;margin:0 auto;margin-top:10%}.lockscreen .lockscreen-name{text-align:center;font-weight:600}.lockscreen-item{border-radius:4px;padding:0;background:#fff;position:relative;margin:10px auto 30px auto;width:290px}.lockscreen-image{border-radius:50%;position:absolute;left:-10px;top:-25px;background:#fff;padding:5px;z-index:10}.lockscreen-image>img{border-radius:50%;width:70px;height:70px}.lockscreen-credentials{margin-left:70px}.lockscreen-credentials .form-control{border:0}.lockscreen-credentials .btn{background-color:#fff;border:0;padding:0 10px}.lockscreen-footer{margin-top:10px}.login-logo,.register-logo{font-size:35px;text-align:center;margin-bottom:25px;font-weight:300}.login-logo a,.register-logo a{color:#444}.login-page,.register-page{background:#d2d6de}.login-box,.register-box{width:360px;margin:7% auto}@media (max-width:768px){.login-box,.register-box{width:90%;margin-top:20px}}.login-box-body,.register-box-body{background:#fff;padding:20px;border-top:0;color:#666}.login-box-body .form-control-feedback,.register-box-body .form-control-feedback{color:#777}.login-box-msg,.register-box-msg{margin:0;text-align:center;padding:0 20px 20px 20px}.social-auth-links{margin:10px 0}.error-page{width:600px;margin:20px auto 0 auto}@media (max-width:991px){.error-page{width:100%}}.error-page>.headline{float:left;font-size:100px;font-weight:300}@media (max-width:991px){.error-page>.headline{float:none;text-align:center}}.error-page>.error-content{margin-left:190px;display:block}@media (max-width:991px){.error-page>.error-content{margin-left:0}}.error-page>.error-content>h3{font-weight:300;font-size:25px}@media (max-width:991px){.error-page>.error-content>h3{text-align:center}}.invoice{position:relative;background:#fff;border:1px solid #f4f4f4;padding:20px;margin:10px 25px}.invoice-title{margin-top:0}.profile-user-img{margin:0 auto;width:100px;padding:3px;border:3px solid #d2d6de}.profile-username{font-size:21px;margin-top:5px}.post{border-bottom:1px solid #d2d6de;margin-bottom:15px;padding-bottom:15px;color:#666}.post:last-of-type{border-bottom:0;margin-bottom:0;padding-bottom:0}.post .user-block{margin-bottom:15px}.btn-social{position:relative;padding-left:44px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.btn-social>:first-child{position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}.btn-social.btn-lg{padding-left:61px}.btn-social.btn-lg>:first-child{line-height:45px;width:45px;font-size:1.8em}.btn-social.btn-sm{padding-left:38px}.btn-social.btn-sm>:first-child{line-height:28px;width:28px;font-size:1.4em}.btn-social.btn-xs{padding-left:30px}.btn-social.btn-xs>:first-child{line-height:20px;width:20px;font-size:1.2em}.btn-social-icon{position:relative;padding-left:44px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;height:34px;width:34px;padding:0}.btn-social-icon>:first-child{position:absolute;left:0;top:0;bottom:0;width:32px;line-height:34px;font-size:1.6em;text-align:center;border-right:1px solid rgba(0,0,0,0.2)}.btn-social-icon.btn-lg{padding-left:61px}.btn-social-icon.btn-lg>:first-child{line-height:45px;width:45px;font-size:1.8em}.btn-social-icon.btn-sm{padding-left:38px}.btn-social-icon.btn-sm>:first-child{line-height:28px;width:28px;font-size:1.4em}.btn-social-icon.btn-xs{padding-left:30px}.btn-social-icon.btn-xs>:first-child{line-height:20px;width:20px;font-size:1.2em}.btn-social-icon>:first-child{border:none;text-align:center;width:100%}.btn-social-icon.btn-lg{height:45px;width:45px;padding-left:0;padding-right:0}.btn-social-icon.btn-sm{height:30px;width:30px;padding-left:0;padding-right:0}.btn-social-icon.btn-xs{height:22px;width:22px;padding-left:0;padding-right:0}.btn-adn{color:#fff;background-color:#d87a68;border-color:rgba(0,0,0,0.2)}.btn-adn:focus,.btn-adn.focus{color:#fff;background-color:#ce563f;border-color:rgba(0,0,0,0.2)}.btn-adn:hover{color:#fff;background-color:#ce563f;border-color:rgba(0,0,0,0.2)}.btn-adn:active,.btn-adn.active,.open>.dropdown-toggle.btn-adn{color:#fff;background-color:#ce563f;border-color:rgba(0,0,0,0.2)}.btn-adn:active,.btn-adn.active,.open>.dropdown-toggle.btn-adn{background-image:none}.btn-adn .badge{color:#d87a68;background-color:#fff}.btn-bitbucket{color:#fff;background-color:#205081;border-color:rgba(0,0,0,0.2)}.btn-bitbucket:focus,.btn-bitbucket.focus{color:#fff;background-color:#163758;border-color:rgba(0,0,0,0.2)}.btn-bitbucket:hover{color:#fff;background-color:#163758;border-color:rgba(0,0,0,0.2)}.btn-bitbucket:active,.btn-bitbucket.active,.open>.dropdown-toggle.btn-bitbucket{color:#fff;background-color:#163758;border-color:rgba(0,0,0,0.2)}.btn-bitbucket:active,.btn-bitbucket.active,.open>.dropdown-toggle.btn-bitbucket{background-image:none}.btn-bitbucket .badge{color:#205081;background-color:#fff}.btn-dropbox{color:#fff;background-color:#1087dd;border-color:rgba(0,0,0,0.2)}.btn-dropbox:focus,.btn-dropbox.focus{color:#fff;background-color:#0d6aad;border-color:rgba(0,0,0,0.2)}.btn-dropbox:hover{color:#fff;background-color:#0d6aad;border-color:rgba(0,0,0,0.2)}.btn-dropbox:active,.btn-dropbox.active,.open>.dropdown-toggle.btn-dropbox{color:#fff;background-color:#0d6aad;border-color:rgba(0,0,0,0.2)}.btn-dropbox:active,.btn-dropbox.active,.open>.dropdown-toggle.btn-dropbox{background-image:none}.btn-dropbox .badge{color:#1087dd;background-color:#fff}.btn-facebook{color:#fff;background-color:#3b5998;border-color:rgba(0,0,0,0.2)}.btn-facebook:focus,.btn-facebook.focus{color:#fff;background-color:#2d4373;border-color:rgba(0,0,0,0.2)}.btn-facebook:hover{color:#fff;background-color:#2d4373;border-color:rgba(0,0,0,0.2)}.btn-facebook:active,.btn-facebook.active,.open>.dropdown-toggle.btn-facebook{color:#fff;background-color:#2d4373;border-color:rgba(0,0,0,0.2)}.btn-facebook:active,.btn-facebook.active,.open>.dropdown-toggle.btn-facebook{background-image:none}.btn-facebook .badge{color:#3b5998;background-color:#fff}.btn-flickr{color:#fff;background-color:#ff0084;border-color:rgba(0,0,0,0.2)}.btn-flickr:focus,.btn-flickr.focus{color:#fff;background-color:#cc006a;border-color:rgba(0,0,0,0.2)}.btn-flickr:hover{color:#fff;background-color:#cc006a;border-color:rgba(0,0,0,0.2)}.btn-flickr:active,.btn-flickr.active,.open>.dropdown-toggle.btn-flickr{color:#fff;background-color:#cc006a;border-color:rgba(0,0,0,0.2)}.btn-flickr:active,.btn-flickr.active,.open>.dropdown-toggle.btn-flickr{background-image:none}.btn-flickr .badge{color:#ff0084;background-color:#fff}.btn-foursquare{color:#fff;background-color:#f94877;border-color:rgba(0,0,0,0.2)}.btn-foursquare:focus,.btn-foursquare.focus{color:#fff;background-color:#f71752;border-color:rgba(0,0,0,0.2)}.btn-foursquare:hover{color:#fff;background-color:#f71752;border-color:rgba(0,0,0,0.2)}.btn-foursquare:active,.btn-foursquare.active,.open>.dropdown-toggle.btn-foursquare{color:#fff;background-color:#f71752;border-color:rgba(0,0,0,0.2)}.btn-foursquare:active,.btn-foursquare.active,.open>.dropdown-toggle.btn-foursquare{background-image:none}.btn-foursquare .badge{color:#f94877;background-color:#fff}.btn-github{color:#fff;background-color:#444;border-color:rgba(0,0,0,0.2)}.btn-github:focus,.btn-github.focus{color:#fff;background-color:#2b2b2b;border-color:rgba(0,0,0,0.2)}.btn-github:hover{color:#fff;background-color:#2b2b2b;border-color:rgba(0,0,0,0.2)}.btn-github:active,.btn-github.active,.open>.dropdown-toggle.btn-github{color:#fff;background-color:#2b2b2b;border-color:rgba(0,0,0,0.2)}.btn-github:active,.btn-github.active,.open>.dropdown-toggle.btn-github{background-image:none}.btn-github .badge{color:#444;background-color:#fff}.btn-google{color:#fff;background-color:#dd4b39;border-color:rgba(0,0,0,0.2)}.btn-google:focus,.btn-google.focus{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}.btn-google:hover{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}.btn-google:active,.btn-google.active,.open>.dropdown-toggle.btn-google{color:#fff;background-color:#c23321;border-color:rgba(0,0,0,0.2)}.btn-google:active,.btn-google.active,.open>.dropdown-toggle.btn-google{background-image:none}.btn-google .badge{color:#dd4b39;background-color:#fff}.btn-instagram{color:#fff;background-color:#3f729b;border-color:rgba(0,0,0,0.2)}.btn-instagram:focus,.btn-instagram.focus{color:#fff;background-color:#305777;border-color:rgba(0,0,0,0.2)}.btn-instagram:hover{color:#fff;background-color:#305777;border-color:rgba(0,0,0,0.2)}.btn-instagram:active,.btn-instagram.active,.open>.dropdown-toggle.btn-instagram{color:#fff;background-color:#305777;border-color:rgba(0,0,0,0.2)}.btn-instagram:active,.btn-instagram.active,.open>.dropdown-toggle.btn-instagram{background-image:none}.btn-instagram .badge{color:#3f729b;background-color:#fff}.btn-linkedin{color:#fff;background-color:#007bb6;border-color:rgba(0,0,0,0.2)}.btn-linkedin:focus,.btn-linkedin.focus{color:#fff;background-color:#005983;border-color:rgba(0,0,0,0.2)}.btn-linkedin:hover{color:#fff;background-color:#005983;border-color:rgba(0,0,0,0.2)}.btn-linkedin:active,.btn-linkedin.active,.open>.dropdown-toggle.btn-linkedin{color:#fff;background-color:#005983;border-color:rgba(0,0,0,0.2)}.btn-linkedin:active,.btn-linkedin.active,.open>.dropdown-toggle.btn-linkedin{background-image:none}.btn-linkedin .badge{color:#007bb6;background-color:#fff}.btn-microsoft{color:#fff;background-color:#2672ec;border-color:rgba(0,0,0,0.2)}.btn-microsoft:focus,.btn-microsoft.focus{color:#fff;background-color:#125acd;border-color:rgba(0,0,0,0.2)}.btn-microsoft:hover{color:#fff;background-color:#125acd;border-color:rgba(0,0,0,0.2)}.btn-microsoft:active,.btn-microsoft.active,.open>.dropdown-toggle.btn-microsoft{color:#fff;background-color:#125acd;border-color:rgba(0,0,0,0.2)}.btn-microsoft:active,.btn-microsoft.active,.open>.dropdown-toggle.btn-microsoft{background-image:none}.btn-microsoft .badge{color:#2672ec;background-color:#fff}.btn-openid{color:#fff;background-color:#f7931e;border-color:rgba(0,0,0,0.2)}.btn-openid:focus,.btn-openid.focus{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}.btn-openid:hover{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}.btn-openid:active,.btn-openid.active,.open>.dropdown-toggle.btn-openid{color:#fff;background-color:#da7908;border-color:rgba(0,0,0,0.2)}.btn-openid:active,.btn-openid.active,.open>.dropdown-toggle.btn-openid{background-image:none}.btn-openid .badge{color:#f7931e;background-color:#fff}.btn-pinterest{color:#fff;background-color:#cb2027;border-color:rgba(0,0,0,0.2)}.btn-pinterest:focus,.btn-pinterest.focus{color:#fff;background-color:#9f191f;border-color:rgba(0,0,0,0.2)}.btn-pinterest:hover{color:#fff;background-color:#9f191f;border-color:rgba(0,0,0,0.2)}.btn-pinterest:active,.btn-pinterest.active,.open>.dropdown-toggle.btn-pinterest{color:#fff;background-color:#9f191f;border-color:rgba(0,0,0,0.2)}.btn-pinterest:active,.btn-pinterest.active,.open>.dropdown-toggle.btn-pinterest{background-image:none}.btn-pinterest .badge{color:#cb2027;background-color:#fff}.btn-reddit{color:#000;background-color:#eff7ff;border-color:rgba(0,0,0,0.2)}.btn-reddit:focus,.btn-reddit.focus{color:#000;background-color:#bcddff;border-color:rgba(0,0,0,0.2)}.btn-reddit:hover{color:#000;background-color:#bcddff;border-color:rgba(0,0,0,0.2)}.btn-reddit:active,.btn-reddit.active,.open>.dropdown-toggle.btn-reddit{color:#000;background-color:#bcddff;border-color:rgba(0,0,0,0.2)}.btn-reddit:active,.btn-reddit.active,.open>.dropdown-toggle.btn-reddit{background-image:none}.btn-reddit .badge{color:#eff7ff;background-color:#000}.btn-soundcloud{color:#fff;background-color:#f50;border-color:rgba(0,0,0,0.2)}.btn-soundcloud:focus,.btn-soundcloud.focus{color:#fff;background-color:#c40;border-color:rgba(0,0,0,0.2)}.btn-soundcloud:hover{color:#fff;background-color:#c40;border-color:rgba(0,0,0,0.2)}.btn-soundcloud:active,.btn-soundcloud.active,.open>.dropdown-toggle.btn-soundcloud{color:#fff;background-color:#c40;border-color:rgba(0,0,0,0.2)}.btn-soundcloud:active,.btn-soundcloud.active,.open>.dropdown-toggle.btn-soundcloud{background-image:none}.btn-soundcloud .badge{color:#f50;background-color:#fff}.btn-tumblr{color:#fff;background-color:#2c4762;border-color:rgba(0,0,0,0.2)}.btn-tumblr:focus,.btn-tumblr.focus{color:#fff;background-color:#1c2d3f;border-color:rgba(0,0,0,0.2)}.btn-tumblr:hover{color:#fff;background-color:#1c2d3f;border-color:rgba(0,0,0,0.2)}.btn-tumblr:active,.btn-tumblr.active,.open>.dropdown-toggle.btn-tumblr{color:#fff;background-color:#1c2d3f;border-color:rgba(0,0,0,0.2)}.btn-tumblr:active,.btn-tumblr.active,.open>.dropdown-toggle.btn-tumblr{background-image:none}.btn-tumblr .badge{color:#2c4762;background-color:#fff}.btn-twitter{color:#fff;background-color:#55acee;border-color:rgba(0,0,0,0.2)}.btn-twitter:focus,.btn-twitter.focus{color:#fff;background-color:#2795e9;border-color:rgba(0,0,0,0.2)}.btn-twitter:hover{color:#fff;background-color:#2795e9;border-color:rgba(0,0,0,0.2)}.btn-twitter:active,.btn-twitter.active,.open>.dropdown-toggle.btn-twitter{color:#fff;background-color:#2795e9;border-color:rgba(0,0,0,0.2)}.btn-twitter:active,.btn-twitter.active,.open>.dropdown-toggle.btn-twitter{background-image:none}.btn-twitter .badge{color:#55acee;background-color:#fff}.btn-vimeo{color:#fff;background-color:#1ab7ea;border-color:rgba(0,0,0,0.2)}.btn-vimeo:focus,.btn-vimeo.focus{color:#fff;background-color:#1295bf;border-color:rgba(0,0,0,0.2)}.btn-vimeo:hover{color:#fff;background-color:#1295bf;border-color:rgba(0,0,0,0.2)}.btn-vimeo:active,.btn-vimeo.active,.open>.dropdown-toggle.btn-vimeo{color:#fff;background-color:#1295bf;border-color:rgba(0,0,0,0.2)}.btn-vimeo:active,.btn-vimeo.active,.open>.dropdown-toggle.btn-vimeo{background-image:none}.btn-vimeo .badge{color:#1ab7ea;background-color:#fff}.btn-vk{color:#fff;background-color:#587ea3;border-color:rgba(0,0,0,0.2)}.btn-vk:focus,.btn-vk.focus{color:#fff;background-color:#466482;border-color:rgba(0,0,0,0.2)}.btn-vk:hover{color:#fff;background-color:#466482;border-color:rgba(0,0,0,0.2)}.btn-vk:active,.btn-vk.active,.open>.dropdown-toggle.btn-vk{color:#fff;background-color:#466482;border-color:rgba(0,0,0,0.2)}.btn-vk:active,.btn-vk.active,.open>.dropdown-toggle.btn-vk{background-image:none}.btn-vk .badge{color:#587ea3;background-color:#fff}.btn-yahoo{color:#fff;background-color:#720e9e;border-color:rgba(0,0,0,0.2)}.btn-yahoo:focus,.btn-yahoo.focus{color:#fff;background-color:#500a6f;border-color:rgba(0,0,0,0.2)}.btn-yahoo:hover{color:#fff;background-color:#500a6f;border-color:rgba(0,0,0,0.2)}.btn-yahoo:active,.btn-yahoo.active,.open>.dropdown-toggle.btn-yahoo{color:#fff;background-color:#500a6f;border-color:rgba(0,0,0,0.2)}.btn-yahoo:active,.btn-yahoo.active,.open>.dropdown-toggle.btn-yahoo{background-image:none}.btn-yahoo .badge{color:#720e9e;background-color:#fff}.fc-button{background:#f4f4f4;background-image:none;color:#444;border-color:#ddd;border-bottom-color:#ddd}.fc-button:hover,.fc-button:active,.fc-button.hover{background-color:#e9e9e9}.fc-header-title h2{font-size:15px;line-height:1.6em;color:#666;margin-left:10px}.fc-header-right{padding-right:10px}.fc-header-left{padding-left:10px}.fc-widget-header{background:#fafafa}.fc-grid{width:100%;border:0}.fc-widget-header:first-of-type,.fc-widget-content:first-of-type{border-left:0;border-right:0}.fc-widget-header:last-of-type,.fc-widget-content:last-of-type{border-right:0}.fc-toolbar{padding:10px;margin:0}.fc-day-number{font-size:20px;font-weight:300;padding-right:10px}.fc-color-picker{list-style:none;margin:0;padding:0}.fc-color-picker>li{float:left;font-size:30px;margin-right:5px;line-height:30px}.fc-color-picker>li .fa{-webkit-transition:-webkit-transform linear .3s;-moz-transition:-moz-transform linear .3s;-o-transition:-o-transform linear .3s;transition:transform linear .3s}.fc-color-picker>li .fa:hover{-webkit-transform:rotate(30deg);-ms-transform:rotate(30deg);-o-transform:rotate(30deg);transform:rotate(30deg)}#add-new-event{-webkit-transition:all linear .3s;-o-transition:all linear .3s;transition:all linear .3s}.external-event{padding:5px 10px;font-weight:bold;margin-bottom:4px;box-shadow:0 1px 1px rgba(0,0,0,0.1);text-shadow:0 1px 1px rgba(0,0,0,0.1);border-radius:3px;cursor:move}.external-event:hover{box-shadow:inset 0 0 90px rgba(0,0,0,0.2)}.select2-container--default.select2-container--focus,.select2-selection.select2-container--focus,.select2-container--default:focus,.select2-selection:focus,.select2-container--default:active,.select2-selection:active{outline:none}.select2-container--default .select2-selection--single,.select2-selection .select2-selection--single{border:1px solid #d2d6de;border-radius:0;padding:6px 12px;height:34px}.select2-container--default.select2-container--open{border-color:#3c8dbc}.select2-dropdown{border:1px solid #d2d6de;border-radius:0}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#3c8dbc;color:white}.select2-results__option{padding:6px 12px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{padding-left:0;padding-right:0;height:auto;margin-top:-4px}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:6px;padding-left:20px}.select2-container--default .select2-selection--single .select2-selection__arrow{height:28px;right:3px}.select2-container--default .select2-selection--single .select2-selection__arrow b{margin-top:0}.select2-dropdown .select2-search__field,.select2-search--inline .select2-search__field{border:1px solid #d2d6de}.select2-dropdown .select2-search__field:focus,.select2-search--inline .select2-search__field:focus{outline:none;border:1px solid #3c8dbc}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option[aria-selected=true],.select2-container--default .select2-results__option[aria-selected=true]:hover{color:#444}.select2-container--default .select2-selection--multiple{border:1px solid #d2d6de;border-radius:0}.select2-container--default .select2-selection--multiple:focus{border-color:#3c8dbc}.select2-container--default.select2-container--focus .select2-selection--multiple{border-color:#d2d6de}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc;border-color:#367fa9;padding:1px 10px;color:#fff}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{margin-right:5px;color:rgba(255,255,255,0.7)}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#fff}.select2-container .select2-selection--single .select2-selection__rendered{padding-right:10px}.pad{padding:10px}.margin{margin:10px}.margin-bottom{margin-bottom:20px}.margin-bottom-none{margin-bottom:0}.margin-r-5{margin-right:5px}.inline{display:inline}.description-block{display:block;margin:10px 0;text-align:center}.description-block.margin-bottom{margin-bottom:25px}.description-block>.description-header{margin:0;padding:0;font-weight:600;font-size:16px}.description-block>.description-text{text-transform:uppercase}.bg-red,.bg-yellow,.bg-aqua,.bg-blue,.bg-light-blue,.bg-green,.bg-navy,.bg-teal,.bg-olive,.bg-lime,.bg-orange,.bg-fuchsia,.bg-purple,.bg-maroon,.bg-black,.bg-red-active,.bg-yellow-active,.bg-aqua-active,.bg-blue-active,.bg-light-blue-active,.bg-green-active,.bg-navy-active,.bg-teal-active,.bg-olive-active,.bg-lime-active,.bg-orange-active,.bg-fuchsia-active,.bg-purple-active,.bg-maroon-active,.bg-black-active,.callout.callout-danger,.callout.callout-warning,.callout.callout-info,.callout.callout-success,.alert-success,.alert-danger,.alert-error,.alert-warning,.alert-info,.label-danger,.label-info,.label-warning,.label-primary,.label-success,.modal-primary .modal-body,.modal-primary .modal-header,.modal-primary .modal-footer,.modal-warning .modal-body,.modal-warning .modal-header,.modal-warning .modal-footer,.modal-info .modal-body,.modal-info .modal-header,.modal-info .modal-footer,.modal-success .modal-body,.modal-success .modal-header,.modal-success .modal-footer,.modal-danger .modal-body,.modal-danger .modal-header,.modal-danger .modal-footer{color:#fff !important}.bg-gray{color:#000;background-color:#d2d6de !important}.bg-gray-light{background-color:#f7f7f7}.bg-black{background-color:#111 !important}.bg-red,.callout.callout-danger,.alert-danger,.alert-error,.label-danger,.modal-danger .modal-body{background-color:#dd4b39 !important}.bg-yellow,.callout.callout-warning,.alert-warning,.label-warning,.modal-warning .modal-body{background-color:#f39c12 !important}.bg-aqua,.callout.callout-info,.alert-info,.label-info,.modal-info .modal-body{background-color:#00c0ef !important}.bg-blue{background-color:#0073b7 !important}.bg-light-blue,.label-primary,.modal-primary .modal-body{background-color:#3c8dbc !important}.bg-green,.callout.callout-success,.alert-success,.label-success,.modal-success .modal-body{background-color:#00a65a !important}.bg-navy{background-color:#001f3f !important}.bg-teal{background-color:#39cccc !important}.bg-olive{background-color:#3d9970 !important}.bg-lime{background-color:#01ff70 !important}.bg-orange{background-color:#ff851b !important}.bg-fuchsia{background-color:#f012be !important}.bg-purple{background-color:#605ca8 !important}.bg-maroon{background-color:#d81b60 !important}.bg-gray-active{color:#000;background-color:#b5bbc8 !important}.bg-black-active{background-color:#000 !important}.bg-red-active,.modal-danger .modal-header,.modal-danger .modal-footer{background-color:#d33724 !important}.bg-yellow-active,.modal-warning .modal-header,.modal-warning .modal-footer{background-color:#db8b0b !important}.bg-aqua-active,.modal-info .modal-header,.modal-info .modal-footer{background-color:#00a7d0 !important}.bg-blue-active{background-color:#005384 !important}.bg-light-blue-active,.modal-primary .modal-header,.modal-primary .modal-footer{background-color:#357ca5 !important}.bg-green-active,.modal-success .modal-header,.modal-success .modal-footer{background-color:#008d4c !important}.bg-navy-active{background-color:#001a35 !important}.bg-teal-active{background-color:#30bbbb !important}.bg-olive-active{background-color:#368763 !important}.bg-lime-active{background-color:#00e765 !important}.bg-orange-active{background-color:#ff7701 !important}.bg-fuchsia-active{background-color:#db0ead !important}.bg-purple-active{background-color:#555299 !important}.bg-maroon-active{background-color:#ca195a !important}[class^="bg-"].disabled{opacity:.65;filter:alpha(opacity=65)}.text-red{color:#dd4b39 !important}.text-yellow{color:#f39c12 !important}.text-aqua{color:#00c0ef !important}.text-blue{color:#0073b7 !important}.text-black{color:#111 !important}.text-light-blue{color:#3c8dbc !important}.text-green{color:#00a65a !important}.text-gray{color:#d2d6de !important}.text-navy{color:#001f3f !important}.text-teal{color:#39cccc !important}.text-olive{color:#3d9970 !important}.text-lime{color:#01ff70 !important}.text-orange{color:#ff851b !important}.text-fuchsia{color:#f012be !important}.text-purple{color:#605ca8 !important}.text-maroon{color:#d81b60 !important}.link-muted{color:#7a869d}.link-muted:hover,.link-muted:focus{color:#606c84}.link-black{color:#666}.link-black:hover,.link-black:focus{color:#999}.hide{display:none !important}.no-border{border:0 !important}.no-padding{padding:0 !important}.no-margin{margin:0 !important}.no-shadow{box-shadow:none !important}.list-unstyled,.chart-legend,.contacts-list,.users-list,.mailbox-attachments{list-style:none;margin:0;padding:0}.list-group-unbordered>.list-group-item{border-left:0;border-right:0;border-radius:0;padding-left:0;padding-right:0}.flat{border-radius:0 !important}.text-bold,.text-bold.table td,.text-bold.table th{font-weight:700}.text-sm{font-size:12px}.jqstooltip{padding:5px !important;width:auto !important;height:auto !important}.bg-teal-gradient{background:#39cccc !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #39cccc), color-stop(1, #7adddd)) !important;background:-ms-linear-gradient(bottom, #39cccc, #7adddd) !important;background:-moz-linear-gradient(center bottom, #39cccc 0, #7adddd 100%) !important;background:-o-linear-gradient(#7adddd, #39cccc) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7adddd', endColorstr='#39cccc', GradientType=0) !important;color:#fff}.bg-light-blue-gradient{background:#3c8dbc !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #3c8dbc), color-stop(1, #67a8ce)) !important;background:-ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;background:-moz-linear-gradient(center bottom, #3c8dbc 0, #67a8ce 100%) !important;background:-o-linear-gradient(#67a8ce, #3c8dbc) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce', endColorstr='#3c8dbc', GradientType=0) !important;color:#fff}.bg-blue-gradient{background:#0073b7 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #0073b7), color-stop(1, #0089db)) !important;background:-ms-linear-gradient(bottom, #0073b7, #0089db) !important;background:-moz-linear-gradient(center bottom, #0073b7 0, #0089db 100%) !important;background:-o-linear-gradient(#0089db, #0073b7) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089db', endColorstr='#0073b7', GradientType=0) !important;color:#fff}.bg-aqua-gradient{background:#00c0ef !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #00c0ef), color-stop(1, #14d1ff)) !important;background:-ms-linear-gradient(bottom, #00c0ef, #14d1ff) !important;background:-moz-linear-gradient(center bottom, #00c0ef 0, #14d1ff 100%) !important;background:-o-linear-gradient(#14d1ff, #00c0ef) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#14d1ff', endColorstr='#00c0ef', GradientType=0) !important;color:#fff}.bg-yellow-gradient{background:#f39c12 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #f39c12), color-stop(1, #f7bc60)) !important;background:-ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;background:-moz-linear-gradient(center bottom, #f39c12 0, #f7bc60 100%) !important;background:-o-linear-gradient(#f7bc60, #f39c12) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60', endColorstr='#f39c12', GradientType=0) !important;color:#fff}.bg-purple-gradient{background:#605ca8 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #605ca8), color-stop(1, #9491c4)) !important;background:-ms-linear-gradient(bottom, #605ca8, #9491c4) !important;background:-moz-linear-gradient(center bottom, #605ca8 0, #9491c4 100%) !important;background:-o-linear-gradient(#9491c4, #605ca8) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9491c4', endColorstr='#605ca8', GradientType=0) !important;color:#fff}.bg-green-gradient{background:#00a65a !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #00a65a), color-stop(1, #00ca6d)) !important;background:-ms-linear-gradient(bottom, #00a65a, #00ca6d) !important;background:-moz-linear-gradient(center bottom, #00a65a 0, #00ca6d 100%) !important;background:-o-linear-gradient(#00ca6d, #00a65a) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ca6d', endColorstr='#00a65a', GradientType=0) !important;color:#fff}.bg-red-gradient{background:#dd4b39 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #dd4b39), color-stop(1, #e47365)) !important;background:-ms-linear-gradient(bottom, #dd4b39, #e47365) !important;background:-moz-linear-gradient(center bottom, #dd4b39 0, #e47365 100%) !important;background:-o-linear-gradient(#e47365, #dd4b39) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e47365', endColorstr='#dd4b39', GradientType=0) !important;color:#fff}.bg-black-gradient{background:#111 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #111), color-stop(1, #2b2b2b)) !important;background:-ms-linear-gradient(bottom, #111, #2b2b2b) !important;background:-moz-linear-gradient(center bottom, #111 0, #2b2b2b 100%) !important;background:-o-linear-gradient(#2b2b2b, #111) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#2b2b2b', endColorstr='#111111', GradientType=0) !important;color:#fff}.bg-maroon-gradient{background:#d81b60 !important;background:-webkit-gradient(linear, left bottom, left top, color-stop(0, #d81b60), color-stop(1, #e73f7c)) !important;background:-ms-linear-gradient(bottom, #d81b60, #e73f7c) !important;background:-moz-linear-gradient(center bottom, #d81b60 0, #e73f7c 100%) !important;background:-o-linear-gradient(#e73f7c, #d81b60) !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e73f7c', endColorstr='#d81b60', GradientType=0) !important;color:#fff}.description-block .description-icon{font-size:16px}.no-pad-top{padding-top:0}.position-static{position:static !important}.list-header{font-size:15px;padding:10px 4px;font-weight:bold;color:#666}.list-seperator{height:1px;background:#f4f4f4;margin:15px 0 9px 0}.list-link>a{padding:4px;color:#777}.list-link>a:hover{color:#222}.font-light{font-weight:300}.user-block:before,.user-block:after{content:" ";display:table}.user-block:after{clear:both}.user-block img{width:40px;height:40px;float:left}.user-block .username,.user-block .description,.user-block .comment{display:block;margin-left:50px}.user-block .username{font-size:16px;font-weight:600}.user-block .description{color:#999;font-size:13px}.user-block.user-block-sm .username,.user-block.user-block-sm .description,.user-block.user-block-sm .comment{margin-left:40px}.user-block.user-block-sm .username{font-size:14px}.img-sm,.img-md,.img-lg,.box-comments .box-comment img,.user-block.user-block-sm img{float:left}.img-sm,.box-comments .box-comment img,.user-block.user-block-sm img{width:30px !important;height:30px !important}.img-sm+.img-push{margin-left:40px}.img-md{width:60px;height:60px}.img-md+.img-push{margin-left:70px}.img-lg{width:100px;height:100px}.img-lg+.img-push{margin-left:110px}.img-bordered{border:3px solid #d2d6de;padding:3px}.img-bordered-sm{border:2px solid #d2d6de;padding:2px}.attachment-block{border:1px solid #f4f4f4;padding:5px;margin-bottom:10px;background:#f7f7f7}.attachment-block .attachment-img{max-width:100px;max-height:100px;height:auto;float:left}.attachment-block .attachment-pushed{margin-left:110px}.attachment-block .attachment-heading{margin:0}.attachment-block .attachment-text{color:#555}.connectedSortable{min-height:100px}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sort-highlight{background:#f4f4f4;border:1px dashed #ddd;margin-bottom:10px}.full-opacity-hover{opacity:.65;filter:alpha(opacity=65)}.full-opacity-hover:hover{opacity:1;filter:alpha(opacity=100)}.chart{position:relative;overflow:hidden;width:100%}.chart svg,.chart canvas{width:100% !important}@media print{.no-print,.main-sidebar,.left-side,.main-header,.content-header{display:none !important}.content-wrapper,.right-side,.main-footer{margin-left:0 !important;min-height:0 !important;-webkit-transform:translate(0, 0) !important;-ms-transform:translate(0, 0) !important;-o-transform:translate(0, 0) !important;transform:translate(0, 0) !important}.fixed .content-wrapper,.fixed .right-side{padding-top:0 !important}.invoice{width:100%;border:0;margin:0;padding:0}.invoice-col{float:left;width:33.3333333%}.table-responsive{overflow:auto}.table-responsive>.table tr th,.table-responsive>.table tr td{white-space:normal !important}}
\ No newline at end of file
diff --git a/css/colors.css b/css/colors.css
new file mode 100644
index 00000000..afe383f8
--- /dev/null
+++ b/css/colors.css
@@ -0,0 +1,51 @@
+.white {
+    color: #fff;
+}
+
+.red,
+.important,
+.critical-priority {
+    color: red;
+}
+
+.green {
+    color: green;
+}
+
+.orange,
+.rating {
+    color: orange;
+}
+
+.medium {
+    color: #FF9900;
+}
+
+.gray {
+    color: grey;
+}
+
+.critical {
+    color: #9400d3;
+}
+
+.blue {
+    color: blue;
+}
+
+.med-low-priority {
+    background-color: #8BB467;
+}
+
+.high-priority {
+    background-color: #ff6a00;
+}
+
+/* Hover colors */
+.red-on-hover:hover {
+    color: red;
+}
+
+.gray-on-hover:hover {
+    color: grey;
+}
\ No newline at end of file
diff --git a/css/displays.css b/css/displays.css
new file mode 100644
index 00000000..6a311eb7
--- /dev/null
+++ b/css/displays.css
@@ -0,0 +1,13 @@
+.hide-on-overflow {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.no-wrap {
+    white-space: nowrap;
+}
+
+.event-category {
+    border-radius: 4px;
+    padding: 5px;
+}
\ No newline at end of file
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
new file mode 100644
index 00000000..c8ed2556
--- /dev/null
+++ b/css/mods-for-hesk-new.css
@@ -0,0 +1,153 @@
+.navbar-nav > .messages-menu > .dropdown-menu >li .menu > li > a,
+.sidebar-menu, .main-sidebar .user-panel, .sidebar-menu > li.header{
+    white-space: normal;
+}
+
+.icon-link {
+    font-size: 16px; !important;
+}
+
+#due-date:hover,
+.click-to-edit:hover {
+    font-weight: bolder;
+    cursor: pointer;
+}
+
+.linkless-dropdown {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.42857143;
+    white-space: nowrap;
+}
+
+.dropdown-menu>li>span>.fa {
+    margin-right: 10px;
+}
+
+.no-margins {
+    margin: 0;
+}
+
+@media (max-width: 991px) {
+    .ticket-cell-admin {
+        border-bottom: solid 1px #ddd;
+        border-right: 0;
+        padding-top: 5px;
+        height: 100px;
+    }
+}
+
+@media (min-width: 992px) {
+    .ticket-cell-admin {
+        border-bottom: 0;
+        border-right: solid 1px #ddd;
+        margin-top: 1px;
+        height: 100px;
+        padding-top: 10px;
+    }
+}
+
+.ticket-property-title {
+    color: rgba(255, 255, 255, .75);
+    font-size: 11px;
+    text-transform: uppercase;
+}
+
+@media (min-width: 992px) {
+    .ticketPropertyText {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .ticketPropertyText:hover {
+        white-space: normal;
+        overflow: visible;
+    }
+}
+
+.ticketPropertyText {
+    font-size: 16px;
+    line-height: 1em;
+    color: #fff;
+    padding-bottom: 2px;
+}
+
+.status-row {
+    margin-bottom: 20px;
+}
+
+.push-down-10 {
+    margin-top: 10px;
+}
+
+
+.attachment-table > tbody > tr > td > i {
+    color: #ddd;
+    text-shadow: 2px 2px #ccc;
+}
+
+.attachment-table > tbody > tr > td {
+    vertical-align: middle;
+}
+
+.attachment-table > tbody > tr > td > span > img {
+    max-height: 80px;
+    max-width: 80px;
+    cursor: pointer;
+}
+
+.note {
+    border-bottom: solid 1px #000;
+}
+
+.fileinput-button {
+    width: 100%;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    margin-top: -2px;
+}
+
+.file-row p.name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.timeline-footer {
+    border-top: 1px solid #f4f4f4;
+}
+
+.timeline > .today-top {
+    margin-bottom: 60px;
+}
+
+.white-readonly {
+    cursor: text !important;
+    background-color: #fff !important;
+}
+
+button.dropdown-submit {
+    background: none !important;
+    border: none;
+}
+
+.form-signin {
+    max-width: 800px;
+    margin: 0 auto;
+}
+
+.loginError {
+    padding-top: 20px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.login-box {
+    width: 500px;
+}
+
+.login-box-body {
+    border-radius: 5px;
+}
\ No newline at end of file
diff --git a/css/positions.css b/css/positions.css
new file mode 100644
index 00000000..70205742
--- /dev/null
+++ b/css/positions.css
@@ -0,0 +1,7 @@
+.move-down-20 {
+    margin-top: 20px;
+}
+
+.move-right-20 {
+    margin-left: 20px;
+}
\ No newline at end of file
diff --git a/css/skins/_all-skins.min.css b/css/skins/_all-skins.min.css
new file mode 100755
index 00000000..e1d2398f
--- /dev/null
+++ b/css/skins/_all-skins.min.css
@@ -0,0 +1 @@
+.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header .logo{background-color:#367fa9;color:#fff;border-bottom:0 solid transparent}.skin-blue .main-header .logo:hover{background-color:#357ca5}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .wrapper,.skin-blue .main-sidebar,.skin-blue .left-side{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li:hover>a,.skin-blue .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#3c8dbc}.skin-blue .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-blue .sidebar-form input[type="text"],.skin-blue .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-blue .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue .sidebar-form input[type="text"]:focus,.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus,.skin-blue-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .content-wrapper,.skin-blue-light .main-footer{border-left:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .treeview-menu>li>a{color:#777}.skin-blue-light .treeview-menu>li.active>a,.skin-blue-light .treeview-menu>li>a:hover{color:#000}.skin-blue-light .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black .main-header .navbar{background-color:#fff}.skin-black .main-header .navbar .nav>li>a{color:#333}.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black .main-header .navbar .sidebar-toggle{color:#333}.skin-black .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black .main-header .navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header .navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black .main-header>.logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo:hover{background-color:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .wrapper,.skin-black .main-sidebar,.skin-black .left-side{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li:hover>a,.skin-black .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-black .pace .pace-progress{background:#222}.skin-black .pace .pace-activity{border-top-color:#222;border-left-color:#222}.skin-black-light .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black-light .main-header .navbar-toggle{color:#333}.skin-black-light .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black-light .main-header .navbar{background-color:#fff}.skin-black-light .main-header .navbar .nav>li>a{color:#333}.skin-black-light .main-header .navbar .nav>li>a:hover,.skin-black-light .main-header .navbar .nav>li>a:active,.skin-black-light .main-header .navbar .nav>li>a:focus,.skin-black-light .main-header .navbar .nav .open>a,.skin-black-light .main-header .navbar .nav .open>a:hover,.skin-black-light .main-header .navbar .nav .open>a:focus,.skin-black-light .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black-light .main-header .navbar .sidebar-toggle{color:#333}.skin-black-light .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black-light .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black-light .main-header .navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black-light .main-header .navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black-light .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black-light .main-header>.logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black-light .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black-light .main-header>.logo:hover{background-color:#1f1f1f}}.skin-black-light .main-header li.user-header{background-color:#222}.skin-black-light .content-header{background:transparent;box-shadow:none}.skin-black-light .wrapper,.skin-black-light .main-sidebar,.skin-black-light .left-side{background-color:#f9fafc}.skin-black-light .content-wrapper,.skin-black-light .main-footer{border-left:1px solid #d2d6de}.skin-black-light .user-panel>.info,.skin-black-light .user-panel>.info>a{color:#444}.skin-black-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-black-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-black-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-black-light .sidebar-menu>li:hover>a,.skin-black-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-black-light .sidebar-menu>li.active{border-left-color:#fff}.skin-black-light .sidebar-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-black-light .sidebar a{color:#444}.skin-black-light .sidebar a:hover{text-decoration:none}.skin-black-light .treeview-menu>li>a{color:#777}.skin-black-light .treeview-menu>li.active>a,.skin-black-light .treeview-menu>li>a:hover{color:#000}.skin-black-light .treeview-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-black-light .sidebar-form input[type="text"],.skin-black-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-black-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black-light .sidebar-form input[type="text"]:focus,.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-black-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#008d4c;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo:hover{background-color:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li:hover>a,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-green-light .main-header .navbar{background-color:#00a65a}.skin-green-light .main-header .navbar .nav>li>a{color:#fff}.skin-green-light .main-header .navbar .nav>li>a:hover,.skin-green-light .main-header .navbar .nav>li>a:active,.skin-green-light .main-header .navbar .nav>li>a:focus,.skin-green-light .main-header .navbar .nav .open>a,.skin-green-light .main-header .navbar .nav .open>a:hover,.skin-green-light .main-header .navbar .nav .open>a:focus,.skin-green-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-green-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-green-light .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green-light .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green-light .main-header .logo{background-color:#00a65a;color:#fff;border-bottom:0 solid transparent}.skin-green-light .main-header .logo:hover{background-color:#00a157}.skin-green-light .main-header li.user-header{background-color:#00a65a}.skin-green-light .content-header{background:transparent}.skin-green-light .wrapper,.skin-green-light .main-sidebar,.skin-green-light .left-side{background-color:#f9fafc}.skin-green-light .content-wrapper,.skin-green-light .main-footer{border-left:1px solid #d2d6de}.skin-green-light .user-panel>.info,.skin-green-light .user-panel>.info>a{color:#444}.skin-green-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-green-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-green-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-green-light .sidebar-menu>li:hover>a,.skin-green-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-green-light .sidebar-menu>li.active{border-left-color:#00a65a}.skin-green-light .sidebar-menu>li.active>a{font-weight:600}.skin-green-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-green-light .sidebar a{color:#444}.skin-green-light .sidebar a:hover{text-decoration:none}.skin-green-light .treeview-menu>li>a{color:#777}.skin-green-light .treeview-menu>li.active>a,.skin-green-light .treeview-menu>li>a:hover{color:#000}.skin-green-light .treeview-menu>li.active>a{font-weight:600}.skin-green-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-green-light .sidebar-form input[type="text"],.skin-green-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-green-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-green-light .sidebar-form input[type="text"]:focus,.skin-green-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-green-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav .open>a:focus,.skin-red .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header .logo{background-color:#d73925;color:#fff;border-bottom:0 solid transparent}.skin-red .main-header .logo:hover{background-color:#d33724}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .wrapper,.skin-red .main-sidebar,.skin-red .left-side{background-color:#222d32}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red .sidebar-menu>li:hover>a,.skin-red .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#dd4b39}.skin-red .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-red .sidebar-form input[type="text"],.skin-red .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-red .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-red .sidebar-form input[type="text"]:focus,.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-red-light .main-header .navbar{background-color:#dd4b39}.skin-red-light .main-header .navbar .nav>li>a{color:#fff}.skin-red-light .main-header .navbar .nav>li>a:hover,.skin-red-light .main-header .navbar .nav>li>a:active,.skin-red-light .main-header .navbar .nav>li>a:focus,.skin-red-light .main-header .navbar .nav .open>a,.skin-red-light .main-header .navbar .nav .open>a:hover,.skin-red-light .main-header .navbar .nav .open>a:focus,.skin-red-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-light .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-light .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red-light .main-header .logo{background-color:#dd4b39;color:#fff;border-bottom:0 solid transparent}.skin-red-light .main-header .logo:hover{background-color:#dc4735}.skin-red-light .main-header li.user-header{background-color:#dd4b39}.skin-red-light .content-header{background:transparent}.skin-red-light .wrapper,.skin-red-light .main-sidebar,.skin-red-light .left-side{background-color:#f9fafc}.skin-red-light .content-wrapper,.skin-red-light .main-footer{border-left:1px solid #d2d6de}.skin-red-light .user-panel>.info,.skin-red-light .user-panel>.info>a{color:#444}.skin-red-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-red-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-red-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-red-light .sidebar-menu>li:hover>a,.skin-red-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-red-light .sidebar-menu>li.active{border-left-color:#dd4b39}.skin-red-light .sidebar-menu>li.active>a{font-weight:600}.skin-red-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-red-light .sidebar a{color:#444}.skin-red-light .sidebar a:hover{text-decoration:none}.skin-red-light .treeview-menu>li>a{color:#777}.skin-red-light .treeview-menu>li.active>a,.skin-red-light .treeview-menu>li>a:hover{color:#000}.skin-red-light .treeview-menu>li.active>a{font-weight:600}.skin-red-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-red-light .sidebar-form input[type="text"],.skin-red-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-red-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-red-light .sidebar-form input[type="text"]:focus,.skin-red-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-red-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-yellow .main-header .navbar{background-color:#f39c12}.skin-yellow .main-header .navbar .nav>li>a{color:#fff}.skin-yellow .main-header .navbar .nav>li>a:hover,.skin-yellow .main-header .navbar .nav>li>a:active,.skin-yellow .main-header .navbar .nav>li>a:focus,.skin-yellow .main-header .navbar .nav .open>a,.skin-yellow .main-header .navbar .nav .open>a:hover,.skin-yellow .main-header .navbar .nav .open>a:focus,.skin-yellow .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow .main-header .logo{background-color:#e08e0b;color:#fff;border-bottom:0 solid transparent}.skin-yellow .main-header .logo:hover{background-color:#db8b0b}.skin-yellow .main-header li.user-header{background-color:#f39c12}.skin-yellow .content-header{background:transparent}.skin-yellow .wrapper,.skin-yellow .main-sidebar,.skin-yellow .left-side{background-color:#222d32}.skin-yellow .user-panel>.info,.skin-yellow .user-panel>.info>a{color:#fff}.skin-yellow .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-yellow .sidebar-menu>li>a{border-left:3px solid transparent}.skin-yellow .sidebar-menu>li:hover>a,.skin-yellow .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#f39c12}.skin-yellow .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-yellow .sidebar a{color:#b8c7ce}.skin-yellow .sidebar a:hover{text-decoration:none}.skin-yellow .treeview-menu>li>a{color:#8aa4af}.skin-yellow .treeview-menu>li.active>a,.skin-yellow .treeview-menu>li>a:hover{color:#fff}.skin-yellow .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-yellow .sidebar-form input[type="text"],.skin-yellow .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-yellow .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-yellow .sidebar-form input[type="text"]:focus,.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-yellow-light .main-header .navbar{background-color:#f39c12}.skin-yellow-light .main-header .navbar .nav>li>a{color:#fff}.skin-yellow-light .main-header .navbar .nav>li>a:hover,.skin-yellow-light .main-header .navbar .nav>li>a:active,.skin-yellow-light .main-header .navbar .nav>li>a:focus,.skin-yellow-light .main-header .navbar .nav .open>a,.skin-yellow-light .main-header .navbar .nav .open>a:hover,.skin-yellow-light .main-header .navbar .nav .open>a:focus,.skin-yellow-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow-light .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow-light .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow-light .main-header .logo{background-color:#f39c12;color:#fff;border-bottom:0 solid transparent}.skin-yellow-light .main-header .logo:hover{background-color:#f39a0d}.skin-yellow-light .main-header li.user-header{background-color:#f39c12}.skin-yellow-light .content-header{background:transparent}.skin-yellow-light .wrapper,.skin-yellow-light .main-sidebar,.skin-yellow-light .left-side{background-color:#f9fafc}.skin-yellow-light .content-wrapper,.skin-yellow-light .main-footer{border-left:1px solid #d2d6de}.skin-yellow-light .user-panel>.info,.skin-yellow-light .user-panel>.info>a{color:#444}.skin-yellow-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-yellow-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-yellow-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-yellow-light .sidebar-menu>li:hover>a,.skin-yellow-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-yellow-light .sidebar-menu>li.active{border-left-color:#f39c12}.skin-yellow-light .sidebar-menu>li.active>a{font-weight:600}.skin-yellow-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-yellow-light .sidebar a{color:#444}.skin-yellow-light .sidebar a:hover{text-decoration:none}.skin-yellow-light .treeview-menu>li>a{color:#777}.skin-yellow-light .treeview-menu>li.active>a,.skin-yellow-light .treeview-menu>li>a:hover{color:#000}.skin-yellow-light .treeview-menu>li.active>a{font-weight:600}.skin-yellow-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-yellow-light .sidebar-form input[type="text"],.skin-yellow-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-yellow-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-yellow-light .sidebar-form input[type="text"]:focus,.skin-yellow-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-yellow-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav .open>a:focus,.skin-purple .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header .logo{background-color:#555299;color:#fff;border-bottom:0 solid transparent}.skin-purple .main-header .logo:hover{background-color:#545096}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .wrapper,.skin-purple .main-sidebar,.skin-purple .left-side{background-color:#222d32}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent}.skin-purple .sidebar-menu>li:hover>a,.skin-purple .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#605ca8}.skin-purple .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-purple .sidebar-form input[type="text"],.skin-purple .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-purple .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-purple .sidebar-form input[type="text"]:focus,.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-purple-light .main-header .navbar{background-color:#605ca8}.skin-purple-light .main-header .navbar .nav>li>a{color:#fff}.skin-purple-light .main-header .navbar .nav>li>a:hover,.skin-purple-light .main-header .navbar .nav>li>a:active,.skin-purple-light .main-header .navbar .nav>li>a:focus,.skin-purple-light .main-header .navbar .nav .open>a,.skin-purple-light .main-header .navbar .nav .open>a:hover,.skin-purple-light .main-header .navbar .nav .open>a:focus,.skin-purple-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple-light .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple-light .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple-light .main-header .logo{background-color:#605ca8;color:#fff;border-bottom:0 solid transparent}.skin-purple-light .main-header .logo:hover{background-color:#5d59a6}.skin-purple-light .main-header li.user-header{background-color:#605ca8}.skin-purple-light .content-header{background:transparent}.skin-purple-light .wrapper,.skin-purple-light .main-sidebar,.skin-purple-light .left-side{background-color:#f9fafc}.skin-purple-light .content-wrapper,.skin-purple-light .main-footer{border-left:1px solid #d2d6de}.skin-purple-light .user-panel>.info,.skin-purple-light .user-panel>.info>a{color:#444}.skin-purple-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-purple-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-purple-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-purple-light .sidebar-menu>li:hover>a,.skin-purple-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-purple-light .sidebar-menu>li.active{border-left-color:#605ca8}.skin-purple-light .sidebar-menu>li.active>a{font-weight:600}.skin-purple-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-purple-light .sidebar a{color:#444}.skin-purple-light .sidebar a:hover{text-decoration:none}.skin-purple-light .treeview-menu>li>a{color:#777}.skin-purple-light .treeview-menu>li.active>a,.skin-purple-light .treeview-menu>li>a:hover{color:#000}.skin-purple-light .treeview-menu>li.active>a{font-weight:600}.skin-purple-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-purple-light .sidebar-form input[type="text"],.skin-purple-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-purple-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-purple-light .sidebar-form input[type="text"]:focus,.skin-purple-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-purple-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}
\ No newline at end of file
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 2d84e024..d930433f 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1885,4 +1885,27 @@ function mfh_bytesToUnits($size) {
     $quotient = $size / $bytes_in_megabyte;
 
     return intval($quotient);
+}
+
+/**
+ * Returns the star markup based on the rating provided. Filled in stars are orange, empty stars are gray.
+ */
+function mfh_get_stars($rating) {
+    $int_value = intval($rating);
+    $has_half = $int_value === $rating;
+
+    $markup = '';
+    for ($i = 0; $i < $int_value; $i++) {
+        $markup .= '<i class="fa fa-star orange"></i>';
+    }
+
+    if ($has_half) {
+        $markup .= '<i class="fa fa-star-half-o orange"></i>';
+    }
+
+    for ($i = 0; $i < 5 - $int_value; $i++) {
+        $markup .= '<i class="fa fa-star-o gray"></i>';
+    }
+
+    return $markup;
 }
\ No newline at end of file
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index ea904680..53274e4f 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -37,42 +37,17 @@ if (!defined('IN_SCRIPT')) {
 
 $modsForHesk_settings = mfh_getSettings();
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html>
 <head>
     <title><?php echo(isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?></title>
     <meta http-equiv="Content-Type" content="text/html;charset=<?php echo $hesklang['ENCODING']; ?>"/>
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
-    <?php if ($modsForHesk_settings['rtl']) { ?>
-        <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } else { ?>
-        <link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/datepicker.css" type="text/css" rel="stylesheet"/>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=21" type="text/css" rel="stylesheet"/>
-    <link href="<?php echo HESK_PATH; ?>css/bootstrap-theme.css?v=21" type="text/css"
-          rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {
-        echo 'disabled';
-    } ?>>
-    <?php if ($modsForHesk_settings['rtl']) { ?>
-        <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"
-              type="text/css" rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"
-              type="text/css" rel="stylesheet"/>
-    <?php } else { ?>
-        <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } ?>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css" rel="stylesheet">
-    <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone.min.css">
@@ -81,7 +56,14 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css">
     <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">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.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>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/dropzone.min.js"></script>
@@ -158,6 +140,12 @@ $modsForHesk_settings = mfh_getSettings();
         .h3questionmark {
             color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
         }
+
+        <?php if (defined('PAGE_TITLE') && PAGE_TITLE == 'LOGIN'): ?>
+        body {
+            background: #d2d6de;
+        }
+        <?php endif; ?>
     </style>
 
     <?php
@@ -236,7 +224,7 @@ $modsForHesk_settings = mfh_getSettings();
 
 </head>
 <body onload="<?php echo $onload;
-unset($onload); ?>">
+unset($onload); ?>" class="hold-transition skin-blue sidebar-mini">
 
 <?php
 include(HESK_PATH . 'header.txt');
diff --git a/inc/mail_functions.inc.php b/inc/mail_functions.inc.php
new file mode 100644
index 00000000..d63d49ec
--- /dev/null
+++ b/inc/mail_functions.inc.php
@@ -0,0 +1,22 @@
+<?php
+
+function mfh_get_mail_headers_for_dropdown($user_id, $hesk_settings, $hesklang) {
+    $deleted_user_text = hesk_dbEscape($hesklang['deleted_user_title_case']);
+    $sql = "SELECT `mail`.`id` AS `id`, `mail`.`subject` AS `subject`, 
+              COALESCE(`users`.`name`, '{$deleted_user_text}') AS `from`, `mail`.`dt` AS `date`
+        FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mail` AS `mail`
+        LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `users`
+            ON `mail`.`from` = `users`.`id`
+        WHERE `to` = " . hesk_dbEscape($user_id) . "
+            AND `read` = '0'
+        ORDER BY `mail`.`dt` DESC";
+    
+    $rs = hesk_dbQuery($sql);
+
+    $mails = array();
+    while ($row = hesk_dbFetchAssoc($rs)) {
+        $mails[] = $row;
+    }
+
+    return $mails;
+}
\ No newline at end of file
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
index a7fdb71d..9b489263 100644
--- a/inc/profile_functions.inc.php
+++ b/inc/profile_functions.inc.php
@@ -38,7 +38,7 @@ function hesk_profile_tab($session_array = 'new', $is_profile_page = true, $acti
 {
     global $hesk_settings, $hesklang, $can_reply_tickets, $can_view_tickets, $can_view_unassigned;
     ?>
-    <div role="tabpanel">
+    <div role="tabpanel" class="nav-tabs-custom">
 
         <!-- Nav tabs -->
         <ul class="nav nav-tabs" role="tablist">
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index d08e14e5..32ea57e6 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -33,254 +33,426 @@ if (!defined('IN_SCRIPT')) {
     die('Invalid attempt');
 }
 
-$num_mail = hesk_checkNewMail();
+$mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hesklang);
 ?>
-<?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>';
-}
+<div class="wrapper">
+    <header class="main-header">
 
-// 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">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+        <!-- Logo -->
+        <a href="<?php echo $modsForHesk_settings['navbar_title_url']; ?>" class="logo">
+            <!-- mini logo for sidebar mini 50x50 pixels -->
+            <span class="logo-mini"><!-- TODO Add setting for "Mini Title" --></span>
+            <!-- logo for regular state and mobile devices -->
+            <span class="logo-lg"><?php echo $hesk_settings['hesk_title'] ?></span>
+        </a>
+
+        <!-- Header Navbar: style can be found in header.less -->
+        <nav class="navbar navbar-static-top">
+            <!-- Sidebar toggle button-->
+            <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                 <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="<?php echo $modsForHesk_settings['navbar_title_url']; ?>"><?php echo $hesk_settings['hesk_title'] ?></a>
-        </div>
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav">
+            </a>
+            <!-- Navbar Right Menu -->
+            <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; ?>
+                    <li class="dropdown messages-menu">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            <i class="fa fa-envelope-o"></i>
+                            <?php if (count($mails) > 0): ?>
+                            <span class="label label-success"><?php echo count($mails); ?></span>
+                            <?php endif; ?>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li class="header"><?php echo sprintf($hesklang['you_have_x_messages'],
+                                    count($mails),
+                                    count($mails) == 1
+                                        ? $hesklang['message_lower_case']
+                                        : $hesklang['messages_lower_case']); ?></li>
+                            <!-- Begin New Messages -->
+                            <li>
+                                <!-- inner menu: contains the actual data -->
+                                <ul class="menu">
+                                    <?php foreach ($mails as $mail): ?>
+                                    <li><!-- start message -->
+                                        <a href="mail.php?a=read&id=<?php echo $mail['id']; ?>">
+                                            <!-- TODO User avatars -->
+                                            <!--<div class="pull-left">
+                                                <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
+                                            </div>-->
+                                            <h4>
+                                                <?php echo $mail['from']; ?>
+                                                <small><i class="fa fa-clock-o"></i> <?php echo hesk_dateToString($mail['date'], 0, 0, 0, true); ?></small>
+                                            </h4>
+                                            <p><?php echo $mail['subject']; ?></p>
+                                        </a>
+                                    </li>
+                                    <!-- end message -->
+                                    <?php endforeach; ?>
+                                </ul>
+                            </li>
+                            <li class="footer"><a href="mail.php">See All Messages</a></li>
+                        </ul>
+                    </li>
+                    <!-- User Account: style can be found in dropdown.less -->
+                    <li class="dropdown user user-menu">
+                        <a href="profile.php">
+                            <!--<img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">-->
+                            <i class="fa fa-user"></i>
+                            <span class="hidden-xs"><?php echo hesk_SESSION('name'); ?></span>
+                        </a>
+                    </li>
+                    <!-- Control Sidebar Toggle Button -->
+                    <li>
+                        <a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>">
+                            <i class="octicon octicon-sign-out"></i>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+        </nav>
+    </header>
+    <aside class="main-sidebar">
+        <!-- sidebar: style can be found in sidebar.less -->
+        <section class="sidebar">
+            <!-- sidebar menu: : style can be found in sidebar.less -->
+            <ul class="sidebar-menu">
+                <li class="header"><?php echo $hesklang['main_navigation_uppercase']; ?></li>
                 <?php
                 $active = '';
                 if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_HOME') {
-                    $active = ' class="active"';
+                    $active = 'active';
                 }
                 ?>
-                <li<?php echo $active; ?>><a href="admin_main.php"><i
-                            class="fa fa-home" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?>
-                    </a></li>
-                <?php if (hesk_checkPermission('can_man_users', 0) && hesk_checkPermission('can_man_permission_tpl', 0)) {
+                <li class="<?php echo $active; ?> treeview">
+                    <a href="admin_main.php">
+                        <i class="fa fa-home" <?php echo $iconDisplay; ?>></i> <span><?php echo $hesklang['main_page']; ?></span>
+                    </a>
+                </li>
+                <?php if (hesk_checkPermission('can_man_users', 0) && hesk_checkPermission('can_man_permission_tpl', 0)) :
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
-                        $active = ' active';
+                        $active = 'active';
                     }
-                    echo '<li class="dropdown'.$active.'">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                  <i class="fa fa-users" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_users'] . '<span class="caret"></span>
-                              </a>
-                              <ul class="dropdown-menu" role="menu">
-                                  <li><a href="manage_users.php">' . $hesklang['manage_users'] . '</a></li>
-                                  <li><a href="manage_permission_templates.php">' . $hesklang['permission_tpl_man'] . '</a></li>
-                              </ul>
-                          </li>';
-                } elseif (hesk_checkPermission('can_man_users', 0)) {
+                ?>
+                <li class="<?php echo $active; ?> treeview">
+                    <a href="#">
+                        <i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
+                        <span><?php echo $hesklang['menu_users']; ?></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_users.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['manage_users']; ?></a>
+                        </li>
+                        <li>
+                            <a href="manage_permission_templates.php"><i class="fa fa-circle-o"></i> <?php echo $hesklang['permission_tpl_man']; ?></a>
+                        </li>
+                    </ul>
+                </li>
+                <?php
+                elseif (hesk_checkPermission('can_man_users', 0)) :
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="manage_users.php"><i class="fa fa-users" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_users'] . '</a></li>';
-                } elseif (hesk_checkPermission('can_man_permission_tpl', 0)) {
+                ?>
+                <li class="<?php echo $active; ?> treeview">
+                    <a href="manage_users.php">
+                        <i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
+                        <span><?php echo $hesklang['menu_users']; ?></span>
+                    </a>
+                </li>
+                <?php
+                elseif (hesk_checkPermission('can_man_permission_tpl', 0)) :
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="manage_permission_templates.php">
-                            <i class="fa fa-users" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['permission_templates'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_man_cat', 0)) {
+                ?>
+                <li class="<?php echo $active; ?> treeview">
+                    <a href="manage_permission_templates.php">
+                        <i class="fa fa-users" <?php echo $iconDisplay; ?>></i>
+                        <span><?php echo $hesklang['permission_templates']; ?></span>
+                    </a>
+                </li>
+                <?php
+                endif;
+                if (hesk_checkPermission('can_man_cat', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CATEGORIES') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="manage_categories.php"><i class="fa fa-pie-chart" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_cat'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_man_canned', 0) && hesk_checkPermission('can_man_ticket_tpl', 0)) {
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="manage_categories.php">
+                            <i class="fa fa-pie-chart" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['menu_cat']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+                if (hesk_checkPermission('can_man_canned', 0) && hesk_checkPermission('can_man_ticket_tpl', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CANNED') {
-                        $active = ' active';
+                        $active = 'active';
                     }
-                    echo '<li class="dropdown'.$active.'">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                  <i class="fa fa-file-text-o" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_can'] . '<span class="caret"></span>
-                              </a>
-                              <ul class="dropdown-menu" role="menu">
-                                  <li><a href="manage_canned.php">' . $hesklang['can_man_canned'] . '</a></li>
-                                  <li><a href="manage_ticket_templates.php">' . $hesklang['ticket_tpl_man'] . '</a></li>
-                              </ul>
-                          </li>';
-                } elseif (hesk_checkPermission('can_man_canned', 0)) {
+                ?>
+                    <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>
+                        <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>
+                        </ul>
+                    </li>
+                <?php
+                elseif (hesk_checkPermission('can_man_canned', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CANNED') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="manage_canned.php"><i class="fa fa-file-text-o" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_can'] . '</a></li>';
-                } elseif (hesk_checkPermission('can_man_ticket_tpl', 0)) {
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="manage_canned.php">
+                            <i class="fa fa-file-text-o" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['menu_can']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                elseif (hesk_checkPermission('can_man_ticket_tpl', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CANNED') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="manage_ticket_templates.php"><i class="fa fa-file-text-o" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_can'] . '</a></li>';
-                }
-                if ($hesk_settings['kb_enable']) {
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="manage_ticket_templates.php">
+                            <i class="fa fa-file-text-o" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['menu_can']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+                if ($hesk_settings['kb_enable']):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_KB') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    if (hesk_checkPermission('can_man_kb', 0)) {
-                        echo '<li'.$active.'><a href="manage_knowledgebase.php"><i class="fa fa-book" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_kb'] . '</a></li>';
-                    } else {
-                        echo '<li'.$active.'><a href="knowledgebase_private.php"><i class="fa fa-book" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['menu_kb'] . '</a></li>';
-                    }
-                }
-                if ($modsForHesk_settings['enable_calendar'] != 0) {
+                    if (hesk_checkPermission('can_man_kb', 0)):
+                ?>
+                        <li class="<?php echo $active; ?> treeview">
+                            <a href="manage_knowledgebase.php">
+                                <i class="fa fa-book" <?php echo $iconDisplay; ?>></i>
+                                <span><?php echo $hesklang['menu_kb']; ?></span>
+                            </a>
+                        </li>
+                    <?php else: ?>
+                        <li class="<?php echo $active; ?> treeview">
+                            <a href="knowledgebase_private.php">
+                                <i class="fa fa-book" <?php echo $iconDisplay; ?>></i>
+                                <span><?php echo $hesklang['menu_kb']; ?></span>
+                            </a>
+                        </li>
+                    <?php endif; ?>
+                <?php
+                endif;
+                if ($modsForHesk_settings['enable_calendar'] != 0):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CALENDAR') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="calendar.php"><i class="fa fa-calendar" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['calendar_title_case'] . '</a></li>';
-                }
-                if (hesk_checkPermission('can_run_reports', 0)) {
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="calendar.php">
+                            <i class="fa fa-calendar" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['calendar_title_case']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+                if (hesk_checkPermission('can_run_reports', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_REPORTS') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="reports.php"><i class="fa fa-line-chart" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['reports'] . '</a></li>';
-                } elseif (hesk_checkPermission('can_export', 0)) {
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="reports.php">
+                            <i class="fa fa-line-chart" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['reports']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                elseif (hesk_checkPermission('can_export', 0)):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_REPORTS') {
-                        $active = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="export.php"><i class="fa fa-line-chart" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['reports'] . '</a></li>';
-                }
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="export.php">
+                            <i class="fa fa-line-chart" <?php echo $iconDisplay; ?>></i>
+                            <span><?php echo $hesklang['reports']; ?></span>
+                        </a>
+                    </li>
+                <?php
+                endif;
+
                 $tools_count = 0;
-                $dropdown_items = '<ul class="dropdown-menu" role="menu">';
+                $dropdown_items = array();
                 if (hesk_checkPermission('can_ban_emails', 0)) {
                     $tools_count++;
-                    $dropdown_items .= '<li><a href="banned_emails.php">' . $hesklang['manage_banned_emails'] . '</a></li>';
+                    $dropdown_items['banned_emails'] = $hesklang['manage_banned_emails'];
                 }
                 if (hesk_checkPermission('can_ban_ips', 0)) {
                     $tools_count++;
-                    $dropdown_items .= '<li><a href="banned_ips.php">' . $hesklang['manage_banned_ips'] . '</a></li>';
+                    $dropdown_items['banned_ips'] = $hesklang['manage_banned_ips'];
                 }
                 if (hesk_checkPermission('can_service_msg', 0)) {
                     $tools_count++;
-                    $dropdown_items .= '<li><a href="service_messages.php">' . $hesklang['manage_service_messages'] . '</a></li>';
+                    $dropdown_items['service_messages'] = $hesklang['manage_service_messages'];
                 }
                 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>';
+                    $dropdown_items['manage_email_templates'] = $hesklang['manage_email_templates'];
                 }
                 if (hesk_checkPermission('can_man_ticket_statuses', 0)) {
                     $tools_count++;
-                    $dropdown_items .= '<li><a href="manage_statuses.php">' . $hesklang['manage_statuses'] . '</a></li>';
+                    $dropdown_items['manage_statuses'] = $hesklang['manage_statuses'];
                 }
                 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['view_message_log'] = $hesklang['view_message_log'];
                 }
-                $dropdown_items .= '</ul>';
 
-                if ($tools_count > 1) {
+                if (count($dropdown_items) > 1):
                     $active = '';
                     if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
-                        $active = ' active';
+                        $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>';
+                ?>
+                    <li class="<?php echo $active; ?> treeview">
+                        <a href="#">
+                            <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">
+                            <?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
+                elseif (count($dropdown_items) == 1):
+                    $active = '';
+                    if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TOOLS') {
+                        $active = 'active';
                     }
-                }
-                if (hesk_checkPermission('can_man_settings', 0)) {
+                    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 = ' class="active"';
+                        $active = 'active';
                     }
-                    echo '<li'.$active.'><a href="admin_settings.php"><i class="fa fa-cog" ' . $iconDisplay . '></i>&nbsp;' . $hesklang['settings'] . '</a></li>';
-                }
-
+                ?>
+                    <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 = ' class="active"';
+                    $active = 'active';
                 }
                 ?>
-                <li<?php echo $active; ?>><a href="profile.php"><i
-                            class="fa fa-user" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_profile']; ?>
-                    </a></li>
-                <?php
-                $active = '';
-                if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_MAIL') {
-                    $active = ' class="active"';
-                }
-                ?>
-                <li<?php echo $active; ?>><a href="mail.php"><i
-                            class="fa fa-envelope-o" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_msg']; ?>
-                        <?php if ($num_mail != 0) {
-                            echo '<span class="badge">';
-                            echo $num_mail;
-                            unset($num_mail);
-                            echo '</span>';
-                        } ?>
-                    </a></li>
-                <?php include('custom/show_admin_nav-custom.inc.php');
-                $iconDisplay = ($iconDisplay == '') ? 'style="font-size: 14px"' : $iconDisplay;
-                ?>
-                <li><a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>"><span
-                            class="octicon octicon-sign-out" <?php echo $iconDisplay; ?>></span>&nbsp;<?php echo $hesklang['logout']; ?>
-                    </a></li>
+                <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>
+                </li>
             </ul>
-        </div>
-        <!-- /.navbar-collapse -->
-    </nav>
+        </section>
+        <!-- /.sidebar -->
+    </aside>
+    <div class="content-wrapper">
\ No newline at end of file
diff --git a/inc/ticket/get_tickets.inc.php b/inc/ticket/get_tickets.inc.php
new file mode 100644
index 00000000..53b40e26
--- /dev/null
+++ b/inc/ticket/get_tickets.inc.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * @param $search_filter Filter to search by. Valid criteria:
+ *     //TODO
+ */
+function get_tickets($search_filter, $hesk_settings) {
+    $sql = "SELECT `id`, `trackid`, `name`, `email`, `category`, `priority`, `subject`, LEFT(`message`, 400) AS `message`,
+        `dt`, `lastchange`, `firstreply`, `closedat`, `status`, `openedby`, `firstreplyby`, `closedby`, `replies`, `staffreplies`, `owner`,
+        `time_worked`, `lastreplier`, `replierid`, `archive`, `locked`, `merged`, `due_date`, `latitude`, `longitude`, `user_agent`, 
+        `screen_resolution_width`, `screen_resolution_height`";
+
+    foreach ($hesk_settings['custom_fields'] as $k => $v) {
+        if ($v['use']) {
+            $sql .= ", `" . $k . "`";
+        }
+    }
+
+    $sql .= " FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` WHERE ";
+
+    // --> CATEGORY
+    $category = $search_filter['category'];
+    if ($category > 0 && hesk_okCategory($category, 0)) {
+        $sql .= " `category`='{$category}' ";
+    } else {
+        $sql .= hesk_myCategories();
+    }
+
+    // --> TAGGED
+    $tagged = $search_filter['tagged'];
+    if ($tagged) {
+        $sql .= " AND `archive`='1' ";
+    }
+
+    // --> TICKET ASSIGNMENT
+    $sql = handle_ticket_assignments($search_filter, $sql);
+    
+    // --> TICKET STATUS
+    $statuses = $search_filter['status'];
+    if (count($statuses) > 0) {
+        $sql .= " AND `status` IN ('" . implode("','", $statuses) . "') ";
+    }
+
+    // --> TICKET PRIORITY
+    $priorities = $search_filter['priority'];
+
+    if (count($priorities) > 0) {
+        $sql .= " AND `priority` IN ('" . implode("','", array_keys($priority)) . "') ";
+    }
+
+    // Sorting
+    $sql .= " ORDER BY ";
+    
+    // --> PUSH TO TOP
+    $force_to_top = $search_filter['force_to_top'];
+    $direction = $search_filter['force_direction'];
+    if ($force_to_top != NULL) {
+        if ($force_to_top == 'owner') {
+            $sql .= " CASE WHEN `owner` = '".intval($_SESSION['id'])."' THEN 1 ELSE 0 END DESC, `owner` ASC, ";
+        } else {
+            $sql .= ' `'.hesk_dbEscape($force_to_top).'` ';
+            $sql .= $direction == 'ascending' ? 'ASC, ' : 'DESC, ';
+        }
+    }
+
+    // --> CRITICAL ON TOP
+    $critical_on_top = $search_filter['critical_on_top'];
+    if ($critical_on_top) {
+        $sql .= " CASE WHEN `priority` = '0' THEN 1 ELSE 0 END DESC , ";
+    }
+
+    // --> SORT BY
+    $sort_by = $search_filter['sort_by'];
+    $sort_direction = $search_filter['sort_direction'];
+
+    if ($sort_by) {
+        $sql .= $sort_by == 'lastreplier'
+            ? " CASE WHEN `lastreplier` = '0' THEN 0 ELSE 1 END DESC, COALESCE(`replierid`, NULLIF(`lastreplier`, '0'), `name`) "
+            : ' `'.hesk_dbEscape($sort_by).'` ';
+    } else {
+        $sql .= ' `status` ';
+        $sort_by = 'status';
+    }
+
+    $sql .= $sort_direction == 'ascending'
+        ? ' ASC '
+        : ' DESC ';
+
+    if ($sort_by != 'priority') {
+        $sql .= ' , `priority` ASC ';
+    }
+
+    //Uncomment for debugging purposes
+    //echo "SQL: $sql";
+    $results = hesk_dbQuery($sql);
+
+    return $results;
+}
+
+function handle_ticket_assignments($search_filter, $sql) {
+    $assigned_to_self = $search_filter['assignment']['self'];
+    $assigned_to_others = $search_filter['assignment']['others'];
+    $assigned_to_no_one = $search_filter['assignment']['no_one'];
+
+    if (!$assigned_to_self && !$assigned_to_others && !$assigned_to_no_one) {
+        $assigned_to_self = true;
+        $assigned_to_others = true;
+        $assigned_to_no_one = true;
+
+        if (!defined('MAIN_PAGE')) {
+            hesk_show_notice($hesklang['e_nose']);
+        }
+    }
+
+    /* If the user doesn't have permission to view assigned to others block those */
+    if (!hesk_checkPermission('can_view_ass_others',0)) {
+        $assigned_to_others = 0;
+    }
+
+    /* If the user doesn't have permission to view unassigned tickets block those */
+    if (!hesk_checkPermission('can_view_unassigned',0)) {
+        $assigned_to_no_one = 0;
+    }
+
+    /* Process assignments */
+    if (!$assigned_to_self || !$assigned_to_others || !$assigned_to_no_one) {
+        if ($assigned_to_self && $assigned_to_others) {
+            // All but unassigned
+            $sql .= " AND `owner` > 0 ";
+        } elseif ($assigned_to_self && $assigned_to_no_one) {
+            // My tickets + unassigned
+            $sql .= " AND `owner` IN ('0', '" . intval($_SESSION['id']) . "') ";
+        } elseif ($assigned_to_others && $assigned_to_no_one) {
+            // Assigned to others + unassigned
+            $sql .= " AND `owner` != '" . intval($_SESSION['id']) . "' ";
+        }
+        elseif ($assigned_to_self) {
+            // Assigned to me only
+            $sql .= " AND `owner` = '" . intval($_SESSION['id']) . "' ";
+        } elseif ($assigned_to_others) {
+            // Assigned to others
+            $sql .= " AND `owner` NOT IN ('0', '" . intval($_SESSION['id']) . "') ";
+        } elseif ($assigned_to_no_one) {
+            // Only unassigned
+            $sql .= " AND `owner` = 0 ";
+        }
+    }
+
+    return $sql;
+}
+
+function get_empty_filter() {
+    $search_filter['category'] = NULL;
+    $search_filter['tagged'] = NULL;
+    $search_filter['status'] = NULL;
+    $search_filter['priority'] = NULL;
+    $search_filter['force_to_top'] = NULL;
+    $search_filter['force_direction'] = NULL;
+    $search_filter['critical_on_top'] = NULL;
+    $search_filter['sort_by'] = NULL;
+    $search_filter['sort_direction'] = NULL;
+    $search_filter['assignment'] = array();
+    $search_filter['assignment']['self'] = 0;
+    $search_filter['assignment']['others'] = 0;
+    $search_filter['assignment']['no_one'] = 0;
+
+    return $search_filter;
+}
\ No newline at end of file
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index 2d184db6..2d51790f 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -58,7 +58,6 @@ $result = hesk_dbQuery($sql_count);
 $total = hesk_dbResult($result);
 
 //-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
-echo '<div class="panel-body">';
 if ($total > 0) {
 
     /* This query string will be used to browse pages */
@@ -244,13 +243,13 @@ if ($total > 0) {
             $owner = '';
             $first_line = '(' . $hesklang['unas'] . ')' . " \n\n";
             if ($ticket['owner'] == $_SESSION['id']) {
-                $owner = '<span class="assignedyou" title="' . $hesklang['tasy2'] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['tasy2'] . '"></span></span> ';
+                $owner = '<span class="red" title="' . $hesklang['tasy2'] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['tasy2'] . '"></span></span> ';
                 $first_line = $hesklang['tasy2'] . " \n\n";
             } elseif ($ticket['owner']) {
                 if (!isset($admins[$ticket['owner']])) {
                     $admins[$ticket['owner']] = $hesklang['e_udel'];
                 }
-                $owner = '<span class="assignedother" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"></span></span> ';
+                $owner = '<span class="green" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="' . $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . '"></span></span> ';
                 $first_line = $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . " \n\n";
             }
 
@@ -422,11 +421,15 @@ if ($total > 0) {
         } // End while
         ?>
         </table>
-        </div>
-
-        &nbsp;<br/>
+        <hr>
         <table border="0" width="100%">
             <tr>
+                <td>
+                    <a href="new_ticket.php" class="btn btn-success pull-left">
+                        <span class="glyphicon glyphicon-plus-sign"></span>
+                        <?php echo $hesklang['nti']; ?>
+                    </a>
+                </td>
                 <td width="50%" class="text-right" style="vertical-align:top">
                     <select class="form-control" name="a">
                         <option value="low"
@@ -494,8 +497,7 @@ else {
 
     echo '</div></div>';
 }
-echo '</div>
-    </div>';
+echo '</div>';
 
 
 function hesk_print_list_head()
diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index d2d82586..a65c00e6 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -14,7 +14,6 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
     }
 
     /* List attachments */
-    echo '<p><b>' . $hesklang['attachments'] . ':</b></p><br />';
     $att = explode(',', substr($attachments, 0, -1));
     echo '<div class="table-responsive">';
     echo '<table class="table table-striped attachment-table">';
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index aa15754a..1d278e42 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -1,8 +1,7 @@
 $(document).ready(function() {
     var $readonlyDueDateContainer = $('#readonly-due-date');
     var $editableDueDateContainer = $('#editable-due-date');
-    var $dueDateButton = $('#due-date-button');
-    $dueDateButton.click(function() {
+    $readonlyDueDateContainer.click(function() {
         $readonlyDueDateContainer.hide();
         $editableDueDateContainer.show();
         if ($readonlyDueDateContainer.find('span#due-date').text().trim() == 'None') {
@@ -37,4 +36,9 @@ $(document).ready(function() {
             }
         });
     });
+
+    $('#related-tickets-link').click(function() {
+        $(this).hide();
+        $('.related-ticket').show();
+    })
 });
\ No newline at end of file
diff --git a/js/adminlte.min.js b/js/adminlte.min.js
new file mode 100755
index 00000000..def8a04b
--- /dev/null
+++ b/js/adminlte.min.js
@@ -0,0 +1,13 @@
+/*! AdminLTE app.js
+ * ================
+ * Main JS application file for AdminLTE v2. This file
+ * should be included in all pages. It controls some layout
+ * options and implements exclusive AdminLTE plugins.
+ *
+ * @Author  Almsaeed Studio
+ * @Support <http://www.almsaeedstudio.com>
+ * @Email   <support@almsaeedstudio.com>
+ * @version 2.3.5
+ * @license MIT <http://opensource.org/licenses/MIT>
+ */
+function _init(){"use strict";$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".sidebar").height();if($("body").hasClass("fixed"))$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight());else{var d;b>=c?($(".content-wrapper, .right-side").css("min-height",b-a),d=b-a):($(".content-wrapper, .right-side").css("min-height",c),d=c);var e=$($.AdminLTE.options.controlSidebarOptions.selector);"undefined"!=typeof e&&e.height()>d&&$(".content-wrapper, .right-side").css("min-height",e.height())}},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&window.console&&window.console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu={activate:function(a){var b=$.AdminLTE.options.screenSizes;$(document).on("click",a,function(a){a.preventDefault(),$(window).width()>b.sm-1?$("body").hasClass("sidebar-collapse")?$("body").removeClass("sidebar-collapse").trigger("expanded.pushMenu"):$("body").addClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").hasClass("sidebar-open")?$("body").removeClass("sidebar-open").removeClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").addClass("sidebar-open").trigger("expanded.pushMenu")}),$(".content-wrapper").click(function(){$(window).width()<=b.sm-1&&$("body").hasClass("sidebar-open")&&$("body").removeClass("sidebar-open")}),($.AdminLTE.options.sidebarExpandOnHover||$("body").hasClass("fixed")&&$("body").hasClass("sidebar-mini"))&&this.expandOnHover()},expandOnHover:function(){var a=this,b=$.AdminLTE.options.screenSizes.sm-1;$(".main-sidebar").hover(function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-collapse")&&$(window).width()>b&&a.expand()},function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-expanded-on-hover")&&$(window).width()>b&&a.collapse()})},expand:function(){$("body").removeClass("sidebar-collapse").addClass("sidebar-expanded-on-hover")},collapse:function(){$("body").hasClass("sidebar-expanded-on-hover")&&$("body").removeClass("sidebar-expanded-on-hover").addClass("sidebar-collapse")}},$.AdminLTE.tree=function(a){var b=this,c=$.AdminLTE.options.animationSpeed;$(document).off("click",a+" li a").on("click",a+" li a",function(a){var d=$(this),e=d.next();if(e.is(".treeview-menu")&&e.is(":visible")&&!$("body").hasClass("sidebar-collapse"))e.slideUp(c,function(){e.removeClass("menu-open")}),e.parent("li").removeClass("active");else if(e.is(".treeview-menu")&&!e.is(":visible")){var f=d.parents("ul").first(),g=f.find("ul:visible").slideUp(c);g.removeClass("menu-open");var h=d.parent("li");e.slideDown(c,function(){e.addClass("menu-open"),f.find("li.active").removeClass("active"),h.addClass("active"),b.layout.fix()})}e.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.controlSidebar={activate:function(){var a=this,b=$.AdminLTE.options.controlSidebarOptions,c=$(b.selector),d=$(b.toggleBtnSelector);d.on("click",function(d){d.preventDefault(),c.hasClass("control-sidebar-open")||$("body").hasClass("control-sidebar-open")?a.close(c,b.slide):a.open(c,b.slide)});var e=$(".control-sidebar-bg");a._fix(e),$("body").hasClass("fixed")?a._fixForFixed(c):$(".content-wrapper, .right-side").height()<c.height()&&a._fixForContent(c)},open:function(a,b){b?a.addClass("control-sidebar-open"):$("body").addClass("control-sidebar-open")},close:function(a,b){b?a.removeClass("control-sidebar-open"):$("body").removeClass("control-sidebar-open")},_fix:function(a){var b=this;if($("body").hasClass("layout-boxed")){if(a.css("position","absolute"),a.height($(".wrapper").height()),b.hasBindedResize)return;$(window).resize(function(){b._fix(a)}),b.hasBindedResize=!0}else a.css({position:"fixed",height:"auto"})},_fixForFixed:function(a){a.css({position:"fixed","max-height":"100%",overflow:"auto","padding-bottom":"50px"})},_fixForContent:function(a){$(".content-wrapper, .right-side").css("min-height",a.height())}},$.AdminLTE.boxWidget={selectors:$.AdminLTE.options.boxWidgetOptions.boxWidgetSelectors,icons:$.AdminLTE.options.boxWidgetOptions.boxWidgetIcons,animationSpeed:$.AdminLTE.options.animationSpeed,activate:function(a){var b=this;a||(a=document),$(a).on("click",b.selectors.collapse,function(a){a.preventDefault(),b.collapse($(this))}),$(a).on("click",b.selectors.remove,function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=this,c=a.parents(".box").first(),d=c.find("> .box-body, > .box-footer, > form  >.box-body, > form > .box-footer");c.hasClass("collapsed-box")?(a.children(":first").removeClass(b.icons.open).addClass(b.icons.collapse),d.slideDown(b.animationSpeed,function(){c.removeClass("collapsed-box")})):(a.children(":first").removeClass(b.icons.collapse).addClass(b.icons.open),d.slideUp(b.animationSpeed,function(){c.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp(this.animationSpeed)}}}if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE={},$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",animationSpeed:500,sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,sidebarExpandOnHover:!1,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableFastclick:!1,enableControlSidebar:!0,controlSidebarOptions:{toggleBtnSelector:"[data-toggle='control-sidebar']",selector:".control-sidebar",slide:!0},enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa-minus",open:"fa-plus",remove:"fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},directChat:{enable:!0,contactToggleSelector:'[data-widget="chat-pane-toggle"]'},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"},screenSizes:{xs:480,sm:768,md:992,lg:1200}},$(function(){"use strict";$("body").removeClass("hold-transition"),"undefined"!=typeof AdminLTEOptions&&$.extend(!0,$.AdminLTE.options,AdminLTEOptions);var a=$.AdminLTE.options;_init(),$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.enableControlSidebar&&$.AdminLTE.controlSidebar.activate(),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:a.navbarMenuHeight,alwaysVisible:!1,size:a.navbarMenuSlimscrollWidth}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu.activate(a.sidebarToggleSelector),a.enableBSToppltip&&$("body").tooltip({selector:a.BSTooltipSelector}),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),a.enableFastclick&&"undefined"!=typeof FastClick&&FastClick.attach(document.body),a.directChat.enable&&$(document).on("click",a.directChat.contactToggleSelector,function(){var a=$(this).parents(".direct-chat").first();a.toggleClass("direct-chat-contacts-open")}),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").on("click",function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),function(a){"use strict";a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(a){return a},onLoadDone:function(a){return a}},b),f=a('<div class="overlay"><div class="fa fa-refresh fa-spin"></div></div>');return this.each(function(){if(""===e.source)return void(window.console&&window.console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.on("click",function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){"use strict";a.fn.activateBox=function(){a.AdminLTE.boxWidget.activate(this)},a.fn.toggleBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.collapse,this);a.AdminLTE.boxWidget.collapse(b)},a.fn.removeBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.remove,this);a.AdminLTE.boxWidget.remove(b)}}(jQuery),function(a){"use strict";a.fn.todolist=function(b){var c=a.extend({onCheck:function(a){return a},onUncheck:function(a){return a}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),a("input",b).is(":checked")?c.onCheck.call(b):c.onUncheck.call(b)})})}}(jQuery);
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 9aeaee03..2a39ef5e 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -21,6 +21,52 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
 // This is the email break line that will be used in email piping
 $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
+// ADDED OR MODIFIED IN Mods for HESK 2.7.0
+$hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 
+$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';
+$hesklang['articles_in_category_x'] = 'Articles in Category %s'; // %s: category name
+$hesklang['private_category_star'] = 'Private categories indicated by *';
+$hesklang['private_article_star'] = 'Private articles indicated by *';
+$hesklang['ticket_details'] = 'Ticket Details';
+$hesklang['more'] = 'More';
+$hesklang['language_colon'] = 'Language:';
+$hesklang['created_colon'] = 'Created:';
+$hesklang['updated_colon'] = 'Updated:';
+$hesklang['last_replier_colon'] = 'Last replier:';
+$hesklang['click_to_edit'] = 'Click to edit';
+$hesklang['no_device_information'] = 'No device information';
+$hesklang['message_colon'] = 'Message:';
+$hesklang['original_message'] = 'Original message';
+$hesklang['reply_by_customer'] = 'Reply by customer';
+$hesklang['reply_by_staff'] = 'Reply by staff';
+$hesklang['timeline_today'] = 'Today';
+$hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket';
+$hesklang['private_message_header'] = 'Private Message';
+$hesklang['date_colon'] = 'Date:';
+$hesklang['api_information'] = 'API Information';
+$hesklang['api_version'] = 'API Version';
+$hesklang['external_api'] = 'External API';
+$hesklang['external_api_help'] = 'Enable or Disable the external REST API';
+$hesklang['disabled_title_case'] = 'Disabled';
+$hesklang['enabled_title_case'] = 'Enabled';
+$hesklang['api_settings'] = 'API Settings';
+$hesklang['user_security'] = 'User Security';
+$hesklang['api_documentation'] = 'API Documentation';
+$hesklang['changes_saved'] = 'Changes saved!';
+$hesklang['save_failed_check_logs'] = 'Saving changes failed. Check the logs for more information.';
+$hesklang['number_of_tokens'] = 'Number of Tokens';
+$hesklang['generate_new_token'] = 'Generate New Token';
+$hesklang['revoke_all_tokens'] = 'Revoke All Tokens';
+$hesklang['generated_token_colon'] = 'Generated Token:';
+$hesklang['record_this_token_warning'] = 'Please record this token, as this is the only time you will be able to view it!';
+$hesklang['all_tokens_revoked'] = 'All tokens for this user have been revoked';
+$hesklang['staff_login_title'] = 'Staff Login';
+
 // ADDED OR MODIFIED IN Mods for HESK 2.6.0
 $hesklang['search_logs'] = 'Search Logs';
 $hesklang['date_logged'] = 'Date Logged';
@@ -1809,7 +1855,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';