diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 7b1bb404..fea26187 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -91,12 +91,313 @@ if (defined('HESK_DEMO')) {
     $hesk_settings['recaptcha_private_key'] = $hesklang['hdemo'];
 }
 
+/* This will handle error, success and notice messages */
+hesk_handle_messages();
+
+// 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']);
+    }
+
+    // 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);
+    }
 
-<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>
+    function checkTime(i) {
+        if (i < 10) {
+            i = "0" + i;
+        }
+        return i;
+    }
+    //-->
+</script>
+<section class="content">
+    <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">
@@ -243,1887 +544,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();
-
-        // 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']);
-            }
-
-            // 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;
-                }
+    <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">
+
+        <!-- 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>
 
-                if ($tmp < $hesk_settings['attachments']['max_size']) {
-                    hesk_show_notice($hesklang['fatte2']);
-                }
-            }
+                <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>
 
-            // 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;
-                }
+                    <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>
+                <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>
 
-                if ($tmp < ($hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288)) {
-                    hesk_show_notice($hesklang['fatte3']);
-                }
-            }
-        }
+                    <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>
+                <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>
 
+                    <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>
+                <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>
 
-        $hesklang['err_custname'] = addslashes($hesklang['err_custname']);
+                    <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>
+                <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>
 
-        $modsForHesk_settings = mfh_getSettings();
-        ?>
-        <script language="javascript" type="text/javascript"><!--
-            function hesk_checkFields() {
-                d = document.form1;
+                    <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>
+                <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>
 
-                // 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;
-                }
+                    <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>
 
-                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;
-                    }
-                }
+                <h4 class="bold"><?php echo $hesklang['lgs']; ?></h4>
 
-                // 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;
-                }
+                <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>
 
-                // KNOWLEDGEBASE
+                    <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>
 
-                // MISC
+                <h4 class="bold"><?php echo $hesklang['db']; ?></h4>
 
-                // 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;
-                }
+                <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';
 
-                // DISABLE SUBMIT BUTTON
-                d.submitbutton.disabled = true;
-                d.submitbutton.value = '<?php echo addslashes($hesklang['saving']); ?>';
+                                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;
 
-                return true;
-            }
+                                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);
 
-            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;
-            }
+                                xmlHttp = GetXmlHttpObject();
+                                if (xmlHttp == null) {
+                                    return;
+                                }
 
-            function hesk_toggleLayer(nr, setto) {
-                if (document.all)
-                    document.all[nr].style.display = setto;
-                else if (document.getElementById)
-                    document.getElementById(nr).style.display = setto;
-            }
+                                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");
 
-            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;
-            }
+                                xmlHttp.onreadystatechange = function () {
+                                    if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                                        element.innerHTML = xmlHttp.responseText;
+                                    }
+                                }
 
-            var tabberOptions = {
+                                xmlHttp.send(params);
+                            }
+                        </script>
+                        <!-- END MYSQL TEST -->
+                    </div>
+                </div>
+            </div>
+        </div>
 
-                'cookie': "tabber",
-                'onLoad': function (argsObj) {
-                    var t = argsObj.tabber;
-                    var i;
-                    if (t.id) {
-                        t.cookie = t.id + t.cookie;
-                    }
+        <!-- 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>
 
-                    i = parseInt(getCookie(t.cookie));
-                    if (isNaN(i)) {
-                        return;
-                    }
-                    t.tabShow(i);
-                },
+                    <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>
 
-                'onClick': function (argsObj) {
-                    var c = argsObj.tabber.cookie;
-                    var i = argsObj.index;
-                    setCookie(c, i);
-                }
-            };
+                    <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>
 
-            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));
+                    <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>
 
-            function startTime() {
-                var h = today.getHours();
-                var m = today.getMinutes();
-                var s = today.getSeconds();
+                    <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>
 
-                h = checkTime(h);
-                m = checkTime(m);
+                    <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>
 
-                document.getElementById('servertime').innerHTML = h + ":" + m;
-                s = s + 1;
-                today.setSeconds(s);
-                t = setTimeout('startTime()', 1000);
-            }
+                    <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>
 
-            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="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 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>
-                    <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>
-                    <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>
-
-                        <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>
-                    <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>
-                    <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>
-                    <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>
-                </div>
-
-                <!-- Helpdesk Settings -->
-                <div class="tab-pane fade in" id="helpdesk">
-                    <h6 class="bold"><?php echo $hesklang['hd']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <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 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>
-
-                    <h6 class="bold"><?php echo $hesklang['features']; ?></h6>
-
-                    <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>
+                <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="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>
+                    <!-- 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="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>
+                        <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="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>
+                        <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="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>
+                        <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="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>
+                        <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="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">
+                        </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>
+                                <?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="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>
+                        <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 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 class="form-group">
-                                <label for="quick_help_sections[]" class="col-sm-6 control-label">
+                        </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>
+                                <?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">
+                            <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
-                                    $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>
+                                endwhile;
+                                ?>
                             </div>
                         </div>
                     </div>
+                </div>
 
-                    <h6 class="bold"><?php echo $hesklang['sp']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
-
-                    <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>
+                <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';
+                    <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 '
+                        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; ?>;">
-
-                                &nbsp;<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; ?>;">
+                        ?>
+                        <div id="captcha" style="display: <?php echo $div; ?>;">
 
-                                    &nbsp;<br/>
+                            &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>
+                            <b><?php echo $hesklang['sit']; ?>:</b><br/>
 
-                        <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/>
+
+                            <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; ?>;">
 
-                                <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/>
 
-                                <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/>
+                                <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>
-                    <br/>
-                    <h6 class="bold"><?php echo $hesklang['security']; ?></h6>
+                </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="footerWithBorder blankSpace"></div>
+                    <div class="col-sm-9 form-inline">
+                        <?php
+                        $on = '';
+                        $off = '';
+                        $div = 'block';
 
-                    <div class="form-group">
-                        <label for="s_attempt_limit" class="col-sm-4 control-label"><?php echo $hesklang['banlim']; ?>
+                        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_window('<?php echo $help_folder; ?>helpdesk.html#47','400','500')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i></a></label>
+                               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/>
+
+                            <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 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>
+                <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="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 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 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>
+                <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="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 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-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_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>
+                <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 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="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>
-
-                        <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>
+                        <?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>
-                    <br/>
-                    <h6 class="bold"><?php echo $hesklang['attachments']; ?></h6>
+                </div>
 
-                    <div class="footerWithBorder blankSpace"></div>
+                <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="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>
 
-                        <div class="col-sm-9 form-inline">
                             <?php
-                            if ($enable_use_attachments) {
+                            if (!defined('HESK_DEMO')) {
                                 ?>
-                                <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>)
 
-                                    &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>
+                                <div id="attachments_limits" style="display:none">
+                                    upload_max_filesize: <?php echo @ini_get('upload_max_filesize'); ?><br/>
                                     <?php
-                                }
-                            } else {
-                                $onload_status = ' disabled="disabled" ';
-                                echo '<input type="hidden" name="s_attach_use" value="0" /><font class="notice">' . $hesklang['e_attach'] . '</font>';
+                                    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
                             }
-                            ?>
-                        </div>
+                        } else {
+                            $onload_status = ' disabled="disabled" ';
+                            echo '<input type="hidden" name="s_attach_use" value="0" /><font class="notice">' . $hesklang['e_attach'] . '</font>';
+                        }
+                        ?>
                     </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>
+                <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 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 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>';
-                                    }
+                </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>
+                            }
+                            ?>
+                        </select>
                     </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 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>
 
-                <div class="tab-pane fade in" id="knowledgebase">
-                    <h6 class="bold"><?php echo $hesklang['kb_set']; ?></h6>
-
-                    <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>
+        <!-- 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="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>
+                <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>
 
-                        <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 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>
-                    <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>
-
-                        <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="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_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 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>
+                <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 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 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>
+                <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 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 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>
+                <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 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 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>
+                <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 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="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 class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
                     </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>
+                <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 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="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 class="col-sm-5 pad-right-0">
+                        <p class="form-control-static"><?php echo $hesklang['s_onin']; ?></p>
                     </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>
+                <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 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 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 '
+        <!-- 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="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 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 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>
-
-                        <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>
+                        <?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>
-                    <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>
@@ -2139,10 +2160,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 />
@@ -2156,45 +2177,54 @@ if (defined('HESK_DEMO')) {
 
                     </tr>
                     ';
-                        } // End FOR
-                        ?>
-                    </table>
-                </div>
-
-
-                <!-- Email Tab -->
-                <div class="tab-pane fade in" id="email">
-                    <h6 class="bold"><?php echo $hesklang['emlsend']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></div>
+                    } // End FOR
+                    ?>
+                </table>
+            </div>
+        </div>
 
-                    <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 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="col-sm-9">
-                            <?php
-                            $on = '';
-                            $off = '';
-                            $mailgunOn = '';
-                            $onload_div = 'none';
-                            $onload_mailgun = 'none';
-                            $onload_status = '';
+                <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>
 
-                            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="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"
@@ -2223,1280 +2253,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">
+                </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>
+                            <?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 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 class="form-group">
-                            <label for="mailgun_domain" class="col-sm-3 control-label">
+                    </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>
+                            <?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 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 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>
+                <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['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 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 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>
+                    <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-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 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>
 
-                        <!-- START SMTP TEST -->
-                        <div id="smtp_test" style="display:none">
+                        <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>
-
-                        <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 class="form-group">
-                        <label for="s_email_piping" class="col-sm-3 control-label"><?php echo $hesklang['emlpipe']; ?>
+                        <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#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-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
-                                href="Javascript:void(0)"
-                                onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#59','400','500')"><i
+                        <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 = '';
-                            $off = '';
-                            $onload_div = 'none';
-                            $onload_status = '';
-
-                            if ($hesk_settings['pop3']) {
-                                $on = 'checked="checked"';
-                                $onload_div = 'block';
-                            } else {
-                                $off = 'checked="checked"';
-                                $onload_status = ' disabled="disabled" ';
-                            }
-
+                            $on = $hesk_settings['smtp_tls'] ? 'checked="checked"' : '';
+                            $off = $hesk_settings['smtp_tls'] ? '' : 'checked="checked"';
                             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>';
+                            <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>';
                             ?>
-                            <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">
-                                <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>
+                    <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-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="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 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>
+                    <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 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 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 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">
+                        <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 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>
 
-                            <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>
+                    <!-- START SMTP TEST -->
+                    <div id="smtp_test" style="display:none">
+                    </div>
 
-                            <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>
+                    <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';
 
-                        <!-- START POP3 TEST -->
-                        <div id="pop3_test" style="display:none">
-                        </div>
+                            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;
 
-                        <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 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);
 
-                                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;
+                            xmlHttp = GetXmlHttpObject();
+                            if (xmlHttp == null) {
+                                return;
+                            }
 
-                                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.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 = GetXmlHttpObject();
-                                if (xmlHttp == null) {
-                                    return;
+                            xmlHttp.onreadystatechange = function () {
+                                if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
+                                    element.innerHTML = xmlHttp.responseText;
                                 }
+                            }
 
-                                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.send(params);
+                        }
+                        //-->
+                    </script>
+                    <!-- END SMTP TEST -->
 
-                                xmlHttp.onreadystatechange = function () {
-                                    if (xmlHttp.readyState == 4 && xmlHttp.status == 200) {
-                                        element.innerHTML = xmlHttp.responseText;
-                                    }
-                                }
+                </div>
+                <!-- END SMTP SETTINGS DIV -->
 
-                                xmlHttp.send(params);
-                            }
-                            //-->
-                        </script>
-                        <!-- END POP3 TEST -->
+                <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>
-                    <!-- END POP3 SETTINGS DIV -->
-
-                    <h6 class="bold"><?php echo $hesklang['loops']; ?></h6>
-
-                    <div class="footerWithBorder blankSpace"></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_loop_hits" class="col-sm-3 control-label"><?php echo $hesklang['looph']; ?> <a
+                        <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#60','400','500')"><i
+                                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">
+                        <div class="col-sm-9">
                             <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']; ?>"/>
+                                   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_loop_time" class="col-sm-3 control-label"><?php echo $hesklang['loopt']; ?> <a
+                        <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#60','400','500')"><i
+                                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['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>
+                                   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>
 
-                    <h6 class="bold"><?php echo $hesklang['suge']; ?></h6>
+                        <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="footerWithBorder blankSpace"></div>
+                        <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_detect_typos" class="col-sm-3 control-label"><?php echo $hesklang['suge']; ?> <a
+                        <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#62','400','500')"><i
+                                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 = '';
+                        <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>
 
-                            if ($hesk_settings['detect_typos']) {
-                                $on = 'checked="checked"';
-                                $onload_div = 'block';
-                            } else {
-                                $off = 'checked="checked"';
-                                $onload_status = ' disabled="disabled" ';
+                    <!-- 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;
                             }
 
-                            echo '
+                            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>
+                <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">
+                        <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>
+                <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 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>
+                <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 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 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>
+                <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 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 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>
+                <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 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 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>
+                <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">
+                    <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
-                                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
-                                }
+                            } else {
                                 ?>
-                            </div>
+                                <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 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>
+                <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 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 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>
+                <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 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 class="form-group">
-                        <label for="html_emails" class="col-sm-3 col-xs-12 control-label">
+                </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>
+                        <?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 class="form-group">
-                        <label for="email_attachments" class="col-sm-3 col-xs-12 control-label">
+                </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>
+                        <?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 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 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>
+        <!-- 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
-                            // List available fields
-                            foreach ($hesk_settings['possible_ticket_list'] as $key => $title) {
-                                echo '
+                    <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">
+                </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>
+                        <?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 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>
+                <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="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>
+                <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
+                    <div class="col-sm-8 form-inline">
+                        <?php
 
-                            echo '
+                        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>
+            </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>
+        <!-- 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="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 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="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 class="col-sm-6 pad-right-0">
+                            <p class="form-control-static"><?php echo $hesklang['t_m']; ?></p>
                         </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>
+                <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="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>
+                <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 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>
+                <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 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>
-                    <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>
+                <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 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 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>
+                <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 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 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>
+                <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 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 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>
+                <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 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="form-group">
-                        <label for="rtl" class="col-sm-4 col-xs-12 control-label">
+                    <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>
+                        <?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 class="form-group">
-                        <label for="show-icons" class="col-sm-4 col-xs-12 control-label">
+                </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>
+                        <?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 class="form-group">
-                        <label for="use_bootstrap_theme" class="col-sm-4 col-xs-12 control-label">
+                </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>
+                        <?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 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>
+                <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 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>
-                <!-- Mods For Hesk: Color settings -->
-                <div class="tab-pane fade in" id="colors">
-                    <h6 class="bold"><?php echo $hesklang['uiColors']; ?></h6>
+            </div>
+        </div>
 
-                    <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>
+        <!-- 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 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 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>
+                    <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 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 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>
+                <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 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 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>
+                    <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 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 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>
+                <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 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 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>
+                    <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 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 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>
+                <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 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 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>
+                    <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 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 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>
+                <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 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 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>
+                    <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 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 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>
+                <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 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 class="form-group">
-                    <div class="col-sm-9 col-sm-offset-3">
-                        <br/>
-                        <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>
-                </div>
             </div>
-        </form>
-    </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');