diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 26fa3968..f32417de 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -1042,58 +1042,79 @@ function print_select_category($number_of_categories) {
     /* This will handle error, success and notice messages */
     hesk_handle_messages();
     ?>
-
-    <div style="text-align: center">
-
-        <h3><?php echo $hesklang['select_category_staff']; ?></h3>
-
-        <div class="select_category">
-            <?php
-            // Print a select box if number of categories is large
-            if ($number_of_categories > $hesk_settings['cat_show_select'])
-            {
-                ?>
-                <form action="new_ticket.php" method="get">
-                    <select name="category" id="select_category">
-                        <?php
-                        if ($hesk_settings['select_cat'])
-                        {
-                            echo '<option value="">'.$hesklang['select'].'</option>';
-                        }
-                        foreach ($hesk_settings['categories'] as $k=>$v)
-                        {
-                            echo '<option value="'.$k.'">'.$v.'</option>';
-                        }
+    <section class="content">
+        <div class="box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    <?php echo $hesklang['select_category_staff']; ?>
+                </h1>
+            </div>
+            <div class="box-body">
+                <div class="select_category">
+                    <?php
+                    // Print a select box if number of categories is large
+                    if ($number_of_categories > $hesk_settings['cat_show_select'])
+                    {
                         ?>
-                    </select>
+                        <form action="new_ticket.php" method="get">
+                            <select name="category" id="select_category" class="form-control">
+                                <?php
+                                if ($hesk_settings['select_cat'])
+                                {
+                                    echo '<option value="">'.$hesklang['select'].'</option>';
+                                }
+                                foreach ($hesk_settings['categories'] as $k=>$v)
+                                {
+                                    echo '<option value="'.$k.'">'.$v.'</option>';
+                                }
+                                ?>
+                            </select>
 
-                    &nbsp;<br />
+                            &nbsp;<br />
 
-                    <div style="text-align:center">
-                        <input type="submit" value="<?php echo $hesklang['c2c']; ?>" class="btn btn-default">
-                    </div>
-                </form>
-                <?php
-            }
-            // Otherwise print quick links
-            else
-            {
-                ?>
-                <ul id="ul_category">
-                    <?php
-                    foreach ($hesk_settings['categories'] as $k=>$v)
+                            <div style="text-align:center">
+                                <input type="submit" value="<?php echo $hesklang['c2c']; ?>" class="btn btn-default">
+                            </div>
+                        </form>
+                        <?php
+                    }
+                    // Otherwise print quick links
+                    else
                     {
-                        echo '<li><a href="new_ticket.php?a=add&amp;category='.$k.'">&raquo; '.$v.'</a></li>';
+                        // echo '<li><a href="new_ticket.php?a=add&amp;category='.$k.'">&raquo; '.$v.'</a></li>';
+                        $new_row = 1;
+
+                        foreach ($hesk_settings['categories'] as $k=>$v):
+                            if ($new_row == 1) {
+                                echo '<div class="row">';
+                                $new_row = -1;
+                            }
+                            ?>
+                            <div class="col-md-5 col-sm-12 <?php if ($new_row == -1) {echo 'col-md-offset-1';} ?>">
+                                <a href="new_ticket.php?a=add&category=<?php echo $k; ?>" class="button-link">
+                                    <div class="panel panel-default">
+                                        <div class="panel-body">
+                                            <div class="row">
+                                                <div class="col-xs-12">
+                                                    <?php echo $v; ?>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                            <?php
+                            $new_row++;
+                            if ($new_row == 1) {
+                                echo '</div>';
+                            }
+                        endforeach;
                     }
                     ?>
-                </ul>
-                <?php
-            }
-            ?>
+                </div>
+            </div>
         </div>
-    </div>
-
-    <p>&nbsp;</p>
+    </section>
 
     <?php
 
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index c8ed2556..b60c6f72 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -150,4 +150,22 @@ button.dropdown-submit {
 
 .login-box-body {
     border-radius: 5px;
+}
+
+.button-link {
+    color: #4a5571;
+}
+
+.button-link:hover {
+    text-decoration: none;
+    color: #000;
+}
+
+.button-link .col-xs-1 {
+    margin: 0 auto;
+    padding: 0;
+}
+
+.button-link .panel-body:hover {
+    background-color: #EEE;
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index d391fdf4..4a5e409f 100644
--- a/index.php
+++ b/index.php
@@ -90,86 +90,78 @@ function print_select_category($number_of_categories)
         <li><a href="<?php echo $hesk_settings['hesk_url']; ?>"><?php echo $hesk_settings['hesk_title']; ?></a></li>
         <li class="active"><?php echo $hesklang['submit_ticket']; ?></li>
     </ol>
+    <?php
+    /* This will handle error, success and notice messages */
+    hesk_handle_messages();
+    ?>
 
-    <tr>
-        <td>
+    <div style="text-align: center">
 
-            &nbsp;<br />
+        <h3><?php echo $hesklang['select_category_text']; ?></h3>
 
+        <div class="select_category">
             <?php
-            /* This will handle error, success and notice messages */
-            hesk_handle_messages();
-            ?>
-
-            <div style="text-align: center">
-
-                <h3><?php echo $hesklang['select_category_text']; ?></h3>
-
-                <div class="select_category">
-                    <?php
-                    // Print a select box if number of categories is large
-                    if ($number_of_categories > $hesk_settings['cat_show_select'])
-                    {
+            // Print a select box if number of categories is large
+            if ($number_of_categories > $hesk_settings['cat_show_select'])
+            {
+                ?>
+                <form action="index.php" method="get">
+                    <select name="category" id="select_category" class="form-control">
+                        <?php
+                        if ($hesk_settings['select_cat'])
+                        {
+                            echo '<option value="">'.$hesklang['select'].'</option>';
+                        }
+                        foreach ($hesk_settings['categories'] as $k=>$v)
+                        {
+                            echo '<option value="'.$k.'">'.$v.'</option>';
+                        }
                         ?>
-                        <form action="index.php" method="get">
-                            <select name="category" id="select_category" class="form-control">
-                                <?php
-                                if ($hesk_settings['select_cat'])
-                                {
-                                    echo '<option value="">'.$hesklang['select'].'</option>';
-                                }
-                                foreach ($hesk_settings['categories'] as $k=>$v)
-                                {
-                                    echo '<option value="'.$k.'">'.$v.'</option>';
-                                }
-                                ?>
-                            </select>
+                    </select>
 
-                            &nbsp;<br />
+                    &nbsp;<br />
 
-                            <div style="text-align:center">
-                                <input type="submit" value="<?php echo $hesklang['c2c']; ?>" class="orangebutton"  onmouseover="hesk_btn(this,'orangebuttonover');" onmouseout="hesk_btn(this,'orangebutton');" />
-                                <input type="hidden" name="a" value="add" />
-                            </div>
-                        </form>
-                        <?php
-                    }
-                    // Otherwise print quick links
-                    else
-                    {
-                        $new_row = 1;
+                    <div style="text-align:center">
+                        <input type="submit" value="<?php echo $hesklang['c2c']; ?>" class="btn btn-default">
+                        <input type="hidden" name="a" value="add" />
+                    </div>
+                </form>
+                <?php
+            }
+            // Otherwise print quick links
+            else
+            {
+                $new_row = 1;
 
-                        foreach ($hesk_settings['categories'] as $k=>$v):
-                            if ($new_row == 1) {
-                                echo '<div class="row">';
-                                $new_row = -1;
-                            }
-                        ?>
-                            <div class="col-md-5 col-sm-10 col-md-offset-1 col-sm-offset-1">
-                                <a href="index.php?a=add&category=<?php echo $k; ?>" class="button-link">
-                                    <div class="panel panel-default">
-                                        <div class="panel-body">
-                                            <div class="row">
-                                                <div class="col-xs-12">
-                                                    <?php echo $v; ?>
-                                                </div>
-                                            </div>
+                foreach ($hesk_settings['categories'] as $k=>$v):
+                    if ($new_row == 1) {
+                        echo '<div class="row">';
+                        $new_row = -1;
+                    }
+                ?>
+                    <div class="col-md-5 col-sm-10 col-md-offset-1 col-sm-offset-1">
+                        <a href="index.php?a=add&category=<?php echo $k; ?>" class="button-link">
+                            <div class="panel panel-default">
+                                <div class="panel-body">
+                                    <div class="row">
+                                        <div class="col-xs-12">
+                                            <?php echo $v; ?>
                                         </div>
                                     </div>
-                                </a>
+                                </div>
                             </div>
-                        <?php
-                            $new_row++;
-                            if ($new_row == 1) {
-                                echo '</div>';
-                            }
-                        endforeach;
+                        </a>
+                    </div>
+                <?php
+                    $new_row++;
+                    if ($new_row == 1) {
+                        echo '</div>';
                     }
-                    ?>
-                </div>
-            </div>
-
-            <p>&nbsp;</p>
+                endforeach;
+            }
+            ?>
+        </div>
+    </div>
 
     <?php
     return true;