diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 9b8a9dc0..aaf9df54 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_CATEGORIES');
 require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -49,9 +50,9 @@ hesk_checkPermission('can_man_cat');
 // Possible priorities
 $priorities = array(
     3 => array('value' => 3, 'text' => $hesklang['low'], 'formatted' => $hesklang['low']),
-    2 => array('value' => 2, 'text' => $hesklang['medium'], 'formatted' => '<font class="medium">' . $hesklang['medium'] . '</font>'),
-    1 => array('value' => 1, 'text' => $hesklang['high'], 'formatted' => '<font class="important">' . $hesklang['high'] . '</font>'),
-    0 => array('value' => 0, 'text' => $hesklang['critical'], 'formatted' => '<font class="critical">' . $hesklang['critical'] . '</font>'),
+    2 => array('value' => 2, 'text' => $hesklang['medium'], 'formatted' => '<span class="medium">' . $hesklang['medium'] . '</span>'),
+    1 => array('value' => 1, 'text' => $hesklang['high'], 'formatted' => '<span class="important">' . $hesklang['high'] . '</span>'),
+    0 => array('value' => 0, 'text' => $hesklang['critical'], 'formatted' => '<span class="critical">' . $hesklang['critical'] . '</span>'),
 );
 
 /* What should we do? */
@@ -106,221 +107,232 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
     $options .= '>' . $mycat['name'] . '</option>';
 }
 ?>
-<div class="row move-down-20">
-    <div align="left" class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+<section class="content">
+    <div class="box collapsed-box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
                 <?php echo $hesklang['add_cat']; ?>
+            </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 class="panel-body">
-                <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
-                    <div class="form-group">
-                        <p class="col-sm-4 control-label" style="font-size: .87em">
-                            <b><?php echo $hesklang['cat_name']; ?></b> (<?php echo $hesklang['max_chars']; ?>)</p>
-
-                        <div class="col-sm-8">
-                            <input class="form-control"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text"
-                                   name="name" size="40" maxlength="40"
-                                <?php
-                                if (isset($_SESSION['catname'])) {
-                                    echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
-                                }
-                                ?>
-                                   data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>"
-                                   required>
-                            <div class="help-block with-errors"></div>
-                        </div>
+        </div>
+        <div class="box-body">
+            <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
+                <div class="form-group">
+                    <p class="col-sm-4 control-label" style="font-size: .87em">
+                        <b><?php echo $hesklang['cat_name']; ?></b> (<?php echo $hesklang['max_chars']; ?>)</p>
+
+                    <div class="col-sm-8">
+                        <input class="form-control"
+                               placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text"
+                               name="name" size="40" maxlength="40"
+                            <?php
+                            if (isset($_SESSION['catname'])) {
+                                echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
+                            }
+                            ?>
+                               data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>"
+                               required>
+                        <div class="help-block with-errors"></div>
                     </div>
-                    <div class="form-group">
-                        <label for="priority" class="col-sm-4 control-label"
-                               style="font-size: .87em"><?php echo $hesklang['def_pri']; ?> <a href="#"
-                                    onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i
-                                    class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
-
-                        <div class="col-sm-8">
-                            <select name="priority" class="form-control">
-                                <?php
-                                // Default priority: low
-                                if (!isset($_SESSION['cat_priority'])) {
-                                    $_SESSION['cat_priority'] = 3;
-                                }
-
-                                // List possible priorities
-                                foreach ($priorities as $value => $info) {
-                                    echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
-                                }
-                                ?>
-                            </select></p>
+                </div>
+                <div class="form-group">
+                    <label for="priority" class="col-sm-4 control-label"
+                           style="font-size: .87em"><?php echo $hesklang['def_pri']; ?> <a href="#"
+                                                                                           onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i
+                                class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
+
+                    <div class="col-sm-8">
+                        <select name="priority" class="form-control">
+                            <?php
+                            // Default priority: low
+                            if (!isset($_SESSION['cat_priority'])) {
+                                $_SESSION['cat_priority'] = 3;
+                            }
+
+                            // List possible priorities
+                            foreach ($priorities as $value => $info) {
+                                echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
+                            }
+                            ?>
+                        </select>
 
-                        </div>
                     </div>
-                    <div class="form-group">
-                        <label for="color" class="col-sm-4 control-label">
-                            <?php echo $hesklang['category_color']; ?>
-                            <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                               title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
-                               data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
-                        </label>
-                        <div class="col-sm-8">
-                            <input class="form-control colorpicker-trigger"
-                                   placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
-                                   name="color" maxlength="7">
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="color" class="col-sm-4 control-label">
+                        <?php echo $hesklang['category_color']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
+                           data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                    </label>
+                    <div class="col-sm-8">
+                        <input class="form-control colorpicker-trigger"
+                               placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
+                               name="color" maxlength="7">
                     </div>
-                    <div class="form-group">
-                        <label for="usage" class="col-sm-4 control-label"><?php echo $hesklang['usage']; ?></label>
-                        <div class="col-sm-8">
-                            <select name="usage" class="form-control">
-                                <option value="0"><?php echo $hesklang['tickets_and_events']; ?></option>
-                                <option value="1"><?php echo $hesklang['tickets_only']; ?></option>
-                                <option value="2"><?php echo $hesklang['events_only']; ?></option>
-                            </select>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="usage" class="col-sm-4 control-label"><?php echo $hesklang['usage']; ?></label>
+                    <div class="col-sm-8">
+                        <select name="usage" class="form-control">
+                            <option value="0"><?php echo $hesklang['tickets_and_events']; ?></option>
+                            <option value="1"><?php echo $hesklang['tickets_only']; ?></option>
+                            <option value="2"><?php echo $hesklang['events_only']; ?></option>
+                        </select>
                     </div>
-                    <div class="form-group">
-                        <label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?></label>
+                </div>
+                <div class="form-group">
+                    <label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?></label>
 
-                        <div class="col-sm-8">
-                            <?php
-                            if ($hesk_settings['autoassign']) {
-                                ?>
-                                <div class="checkbox">
-                                    <label><input type="checkbox" name="autoassign"
-                                                  value="Y" <?php if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
-                                            echo 'checked="checked"';
-                                        } ?> /> <?php echo $hesklang['cat_aa']; ?></label><br/>
-                                </div>
-                                <?php
-                            }
+                    <div class="col-sm-8">
+                        <?php
+                        if ($hesk_settings['autoassign']) {
                             ?>
                             <div class="checkbox">
-                                <label><input type="checkbox" name="type"
-                                              value="Y" <?php if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
+                                <label><input type="checkbox" name="autoassign"
+                                              value="Y" <?php if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
                                         echo 'checked="checked"';
-                                    } ?> /> <?php echo $hesklang['cat_type']; ?></label>
+                                    } ?> /> <?php echo $hesklang['cat_aa']; ?></label><br/>
                             </div>
+                            <?php
+                        }
+                        ?>
+                        <div class="checkbox">
+                            <label><input type="checkbox" name="type"
+                                          value="Y" <?php if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
+                                    echo 'checked="checked"';
+                                } ?> /> <?php echo $hesklang['cat_type']; ?></label>
                         </div>
                     </div>
-                    <div class="form-group text-center">
-                        <input type="hidden" name="a" value="new"/>
-                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                        <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
-                    </div>
-                </form>
-            </div>
+                </div>
+                <div class="form-group text-center">
+                    <input type="hidden" name="a" value="new"/>
+                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                    <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
+                </div>
+            </form>
         </div>
     </div>
-    <div class="col-md-8">
-        <div class="panel panel-default">
-            <div class="panel-heading">
+    <div class="box">
+        <div class="box-header with-border">
+            <h1 class="box-title">
                 <?php echo $hesklang['manage_cat']; ?> <a href="javascript:void(0)"
                                                           onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['cat_intro']); ?>')"><i
                         class="fa fa-question-circle settingsquestionmark"></i></a>
+            </h1>
+            <div class="box-tools pull-right">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                    <i class="fa fa-minus"></i>
+                </button>
             </div>
-            <div class="panel-body">
-                <?php
-                /* This will handle error, success and notice messages */
-                hesk_handle_messages();
+        </div>
+        <div class="box-body">
+            <?php
+            /* This will handle error, success and notice messages */
+            hesk_handle_messages();
 
-                if ($hesk_settings['cust_urgency']) {
-                    hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']);
+            if ($hesk_settings['cust_urgency']) {
+                hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']);
+            }
+            ?>
+            <table class="table table-hover">
+                <tr>
+                    <th style="display: none"><?php echo $hesklang['id']; ?></th>
+                    <th><?php echo $hesklang['cat_name']; ?></th>
+                    <th><?php echo $hesklang['priority']; ?></th>
+                    <th><?php echo $hesklang['not']; ?></th>
+                    <th><?php echo $hesklang['graph']; ?></th>
+                    <th><?php echo $hesklang['usage']; ?></th>
+                    <th><?php echo $hesklang['manager']; ?></th>
+                    <th><?php echo $hesklang['opt']; ?></th>
+                </tr>
+
+                <?php
+                /* Get number of tickets per category */
+                $tickets_all = array();
+                $tickets_total = 0;
+
+                $res = hesk_dbQuery('SELECT COUNT(*) AS `cnt`, `category` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` GROUP BY `category`');
+                while ($tmp = hesk_dbFetchAssoc($res)) {
+                    $tickets_all[$tmp['category']] = $tmp['cnt'];
+                    $tickets_total += $tmp['cnt'];
                 }
-                ?>
-                <table class="table table-hover">
-                    <tr>
-                        <th style="display: none"><?php echo $hesklang['id']; ?></th>
-                        <th><?php echo $hesklang['cat_name']; ?></th>
-                        <th><?php echo $hesklang['priority']; ?></th>
-                        <th><?php echo $hesklang['not']; ?></th>
-                        <th><?php echo $hesklang['graph']; ?></th>
-                        <th><?php echo $hesklang['usage']; ?></th>
-                        <th><?php echo $hesklang['manager']; ?></th>
-                        <th><?php echo $hesklang['opt']; ?></th>
-                    </tr>
-
-                    <?php
-                    /* Get number of tickets per category */
-                    $tickets_all = array();
-                    $tickets_total = 0;
-
-                    $res = hesk_dbQuery('SELECT COUNT(*) AS `cnt`, `category` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` GROUP BY `category`');
-                    while ($tmp = hesk_dbFetchAssoc($res)) {
-                        $tickets_all[$tmp['category']] = $tmp['cnt'];
-                        $tickets_total += $tmp['cnt'];
-                    }
 
-                    /* Get list of categories */
-                    $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `" . $orderBy . "` ASC");
-                    $usersRes = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `isadmin` = '0' ORDER BY `name` ASC");
-                    $users = array();
-                    while ($userRow = hesk_dbFetchAssoc($usersRes)) {
-                        array_push($users, $userRow);
-                    }
+                /* Get list of categories */
+                $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `" . $orderBy . "` ASC");
+                $usersRes = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `isadmin` = '0' ORDER BY `name` ASC");
+                $users = array();
+                while ($userRow = hesk_dbFetchAssoc($usersRes)) {
+                    array_push($users, $userRow);
+                }
 
-                    $i = 1;
-                    $j = 0;
-                    $num = hesk_dbNumRows($res);
+                $i = 1;
+                $j = 0;
+                $num = hesk_dbNumRows($res);
 
-                    $usage = array(
-                        0 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i>
+                $usage = array(
+                    0 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i>
                                 <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>',
-                        1 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i><i class="fa fa-fw"></i>',
-                        2 => '<i class="fa fa-fw icon-link">&nbsp;</i> <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>'
-                    );
-
-                    while ($mycat = hesk_dbFetchAssoc($res)) {
-                        $j++;
-
-                        if (isset($_SESSION['selcat2']) && $mycat['id'] == $_SESSION['selcat2']) {
-                            $color = 'admin_green';
-                            unset($_SESSION['selcat2']);
-                        } else {
-                            $color = $i ? 'admin_white' : 'admin_gray';
-                        }
+                    1 => '<i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="' . $hesklang['tickets'] . '"></i><i class="fa fa-fw"></i>',
+                    2 => '<i class="fa fa-fw icon-link">&nbsp;</i> <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="' . $hesklang['events'] . '"></i>'
+                );
+
+                while ($mycat = hesk_dbFetchAssoc($res)) {
+                    $j++;
+
+                    if (isset($_SESSION['selcat2']) && $mycat['id'] == $_SESSION['selcat2']) {
+                        $color = 'admin_green';
+                        unset($_SESSION['selcat2']);
+                    } else {
+                        $color = $i ? 'admin_white' : 'admin_gray';
+                    }
 
-                        $tmp = $i ? 'White' : 'Blue';
-                        $style = '';
-                        if ($mycat['color'] == null) {
-                            $style .= 'color: black; border: solid 1px #000';
-                        } else {
-                            $style .= 'background: ' . $mycat['color'];
-                        }
-                        $i = $i ? 0 : 1;
+                    $tmp = $i ? 'White' : 'Blue';
+                    $style = '';
+                    if ($mycat['color'] == null) {
+                        $style .= 'color: black; border: solid 1px #000';
+                    } else {
+                        $style .= 'background: ' . $mycat['color'];
+                    }
+                    $i = $i ? 0 : 1;
 
-                        /* Number of tickets and graph width */
-                        $all = isset($tickets_all[$mycat['id']]) ? $tickets_all[$mycat['id']] : 0;
-                        $width_all = 0;
-                        if ($tickets_total && $all) {
-                            $width_all = round(($all / $tickets_total) * 100);
-                        }
+                    /* Number of tickets and graph width */
+                    $all = isset($tickets_all[$mycat['id']]) ? $tickets_all[$mycat['id']] : 0;
+                    $width_all = 0;
+                    if ($tickets_total && $all) {
+                        $width_all = round(($all / $tickets_total) * 100);
+                    }
 
-                        /* Deleting category with ID 1 (default category) is not allowed */
-                        if ($mycat['id'] == 1) {
-                            $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                        } else {
-                            $remove_code = ' <a href="manage_categories.php?a=remove&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
-                        }
+                    /* Deleting category with ID 1 (default category) is not allowed */
+                    if ($mycat['id'] == 1) {
+                        $remove_code = ' <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                    } else {
+                        $remove_code = ' <a href="manage_categories.php?a=remove&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '" onclick="return confirm_delete();"><i class="fa fa-times icon-link red" data-toggle="tooltip" data-placement="top" title="' . $hesklang['delete'] . '"></i></a>';
+                    }
 
-                        /* Is category private or public? */
-                        if ($mycat['type']) {
-                            $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_private'] . '"></span></a>';
-                        } else {
-                            $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user blue" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_public'] . '"></span></a>';
-                        }
+                    /* Is category private or public? */
+                    if ($mycat['type']) {
+                        $type_code = '<a href="manage_categories.php?a=type&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_private'] . '"></span></a>';
+                    } else {
+                        $type_code = '<a href="manage_categories.php?a=type&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><span class="glyphicon glyphicon-user blue" data-toggle="tooltip" data-placement="top" title="' . $hesklang['cat_public'] . '"></span></a>';
+                    }
 
-                        /* Is auto assign enabled? */
-                        if ($hesk_settings['autoassign']) {
-                            if ($mycat['autoassign']) {
-                                $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
-                            } else {
-                                $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
-                            }
+                    /* Is auto assign enabled? */
+                    if ($hesk_settings['autoassign']) {
+                        if ($mycat['autoassign']) {
+                            $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=0&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link orange" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaon'] . '"></i></a>';
                         } else {
-                            $autoassign_code = '';
+                            $autoassign_code = '<a href="manage_categories.php?a=autoassign&amp;s=1&amp;catid=' . $mycat['id'] . '&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-bolt icon-link gray" data-toggle="tooltip" data-placement="top" title="' . $hesklang['aaoff'] . '"></i></a>';
                         }
+                    } else {
+                        $autoassign_code = '';
+                    }
 
-                        echo '
+                    echo '
                 <tr data-category-id="' . $mycat['id'] . '" data-name="' . htmlspecialchars($mycat['name']) . '"
                     data-color="'. htmlspecialchars($mycat['color']) . '" data-priority="' . $mycat['priority'] . '"
                     data-manager="' . $mycat['manager'] . '" data-usage="'. $mycat['usage'] .'">
@@ -342,31 +354,30 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 ' . $autoassign_code . '
                 ' . $type_code . ' ';
 
-                        if ($orderBy != 'name' && $num > 1) {
-                            if ($j == 1) {
-                                echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;';
-                            } elseif ($j == $num) {
-                                echo '<a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                            } else {
-                                echo '
+                    if ($orderBy != 'name' && $num > 1) {
+                        if ($j == 1) {
+                            echo '<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;';
+                        } elseif ($j == $num) {
+                            echo '<a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                        } else {
+                            echo '
                         <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=-15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-up icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_up'] . '"></i></a>
                         <a href="manage_categories.php?a=order&amp;catid=' . $mycat['id'] . '&amp;move=15&amp;token=' . hesk_token_echo(0) . '"><i class="fa fa-arrow-down icon-link green" data-toggle="tooltip" data-placement="top" title="' . $hesklang['move_dn'] . '"></i></a>&nbsp;
                         ';
-                            }
                         }
-                        echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
-                        echo $remove_code . '</td>
+                    }
+                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
+                    echo $remove_code . '</td>
                 </tr>
                 ';
 
-                    } // End while
+                } // End while
 
-                    ?>
-                </table>
-            </div>
+                ?>
+            </table>
         </div>
     </div>
-</div>
+</section>
 <!-- Edit category modal -->
 <div class="modal fade" id="edit-category-modal" tabindex="-1" role="dialog" style="overflow: hidden">
     <div class="modal-dialog modal-lg" role="document">
diff --git a/css/colors.css b/css/colors.css
index 71fb60e2..54c35775 100644
--- a/css/colors.css
+++ b/css/colors.css
@@ -15,6 +15,18 @@
     color: orange;
 }
 
+.medium {
+    color: #FF9900;
+}
+
 .gray {
     color: grey;
+}
+
+.critical {
+    color: #9400d3;
+}
+
+.blue {
+    color: blue;
 }
\ No newline at end of file