diff --git a/admin/admin_main.php b/admin/admin_main.php
index 0860a0bf..613b4f7f 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -72,7 +72,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 echo '
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h4>'.$hesklang['open_tickets'].' <span style="float: right; font-size: .75em"><a href="new_ticket.php">'.$hesklang['nti'].'</a></span></h4>
+                        <h4>'.$hesklang['open_tickets'].' <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success">'.$hesklang['nti'].'</a></span></h4>
                     </div>'; // The rest of the panel will be printed by print_tickets.inc.php
 	        }
 
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index 42aa8926..3d29d860 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -58,12 +58,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 ?>
 
-<div class="col-md-8 col-md-offset-2">
+<div class="col-md-10 col-md-offset-1" style="margin-top: 20px">
     <?php
     /* This will handle error, success and notice messages */
     hesk_handle_messages();
     ?>
-    <h3 style="text-align: center"><?php echo $hesklang['tickets']; ?></h3>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h4><?php echo $hesklang['tickets']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> New ticket</a></span></h4>
+        </div>
     <?php
         /* Print the list of tickets */
         $is_search = 1;
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index 420d42e8..e878913a 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -98,232 +98,236 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
 ?>
 
 <!-- ** START SHOW TICKET FORM ** -->
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h4><?php echo $hesklang['show_tickets']; ?></h4>
+    </div>
+    <div class="panel-body">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+                <td valign="top">
+                    <form name="showt" action="show_tickets.php" method="get">
+                        <table class="table" style="border-top: 0 !important" border="0" cellpadding="3" cellspacing="0" width="100%">
+                            <tr>
+                                <td style="border-top: 0px" width="20%" class="alignTop"><b><?php echo $hesklang['status']; ?></b>: &nbsp; </td>
+                                <td style="border-top: 0px" width="80%">
+                                    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                        <tr>
+                                            <?php
+                                            $rowCounter = 1;
+                                            $statusRS = hesk_dbQuery('SELECT `ID`, `ShortNameContentKey`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
+                                            while ($row = $statusRS->fetch_assoc())
+                                            {
+                                                if ($rowCounter > 3)
+                                                {
+                                                    echo '</tr><tr>';
+                                                    $rowCounter = 1;
+                                                }
+                                                echo '<td width=';
+                                                if ($rowCounter != 3)
+                                                {
+                                                    echo '"33%"';
+                                                } else
+                                                {
+                                                    echo '"34%"';
+                                                }
+                                                echo '<label><input type="checkbox" name="s'.$row['ID'].'" value="1"';
+                                                if (isset($status[$row['ID']])) {echo 'checked="checked"';}
+                                                echo '/> <span style="font-weight: bold;color: '.$row['TextColor'].';">'.$hesklang[$row['ShortNameContentKey']].'</span></label></td>';
 
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td valign="top">
-<form name="showt" action="show_tickets.php" method="get">
-<h3 style="margin-bottom:5px"><?php echo $hesklang['show_tickets']; ?></h3>
-<div class="footerWithBorder blankSpace"></div>
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tr>
-<td width="20%" class="alignTop"><b><?php echo $hesklang['status']; ?></b>: &nbsp; </td>
-<td width="80%">
+                                                $rowCounter++;
+                                            }
+                                            ?>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
 
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-    <?php
-    $rowCounter = 1;
-    $statusRS = hesk_dbQuery('SELECT `ID`, `ShortNameContentKey`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
-    while ($row = $statusRS->fetch_assoc())
-    {
-        if ($rowCounter > 3)
+        <div id="topSubmit" style="display:<?php echo $more ? 'none' : 'block' ; ?>">
+        &nbsp;<br />
+        <input class="btn btn-default" type="submit" value="<?php echo $hesklang['show_tickets']; ?>" />
+        <a class="btn btn-default" href="javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('divShow');Javascript:hesk_toggleLayerDisplay('topSubmit');document.showt.more.value='1';"><?php echo $hesklang['mopt']; ?></a>
+        <br />&nbsp;<br />
+        </div>
+
+        <div id="divShow" style="display:<?php echo $more ? 'block' : 'none' ; ?>">
+
+        <table class="table table-striped" border="0" cellpadding="3" cellspacing="0" width="100%">
+        <tr>
+        <td width="20%" class="borderTop alignTop"><b><?php echo $hesklang['priority']; ?></b>: &nbsp; </td>
+        <td width="80%" class="borderTop alignTop">
+
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+        <td width="33%"><label><input type="checkbox" name="p0" value="1" <?php if (isset($priority[0])) {echo 'checked="checked"';} ?> /> <span class="critical"><?php echo $hesklang['critical']; ?></span></label></td>
+        <td width="33%"><label><input type="checkbox" name="p2" value="1" <?php if (isset($priority[2])) {echo 'checked="checked"';} ?> /> <span class="medium"><?php echo $hesklang['medium']; ?></span></label></td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        <tr>
+        <td width="33%"><label><input type="checkbox" name="p1" value="1" <?php if (isset($priority[1])) {echo 'checked="checked"';} ?> /> <span class="important"><?php echo $hesklang['high']; ?></span></label></td>
+        <td width="33%"><label><input type="checkbox" name="p3" value="1" <?php if (isset($priority[3])) {echo 'checked="checked"';} ?> /> <span class="normal"><?php echo $hesklang['low']; ?></span></label></td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        </table>
+
+        </td>
+        </tr>
+
+        <tr>
+        <td class="borderTop alignTop"><b><?php echo $hesklang['show']; ?></b>: &nbsp; </td>
+        <td class="borderTop">
+
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+        <td width="33%" class="alignTop">
+        <label><input type="checkbox" name="s_my" value="1" <?php if ($s_my[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_my']; ?></label>
+        <?php
+        if ($can_view_unassigned)
         {
-            echo '</tr><tr>';
-            $rowCounter = 1;
+            ?>
+            <br />
+            <label><input type="checkbox" name="s_un" value="1" <?php if ($s_un[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_un']; ?></label>
+            <?php
         }
-        echo '<td width=';
-        if ($rowCounter != 3)
+        ?>
+        </td>
+        <td width="33%" class="alignTop">
+        <?php
+        if ($can_view_ass_others)
         {
-            echo '"33%"';
-        } else
-        {
-            echo '"34%"';
+            ?>
+            <label><input type="checkbox" name="s_ot" value="1" <?php if ($s_ot[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_ot']; ?></label>
+            <br />
+            <?php
         }
-        echo '<label><input type="checkbox" name="s'.$row['ID'].'" value="1"';
-        if (isset($status[$row['ID']])) {echo 'checked="checked"';}
-        echo '/> <span style="color: '.$row['TextColor'].';">'.$hesklang[$row['ShortNameContentKey']].'</span></label></td>';
+        ?>
+        <label><input type="checkbox" name="archive" value="1" <?php if ($archive[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['disp_only_archived']; ?></label></td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        </table>
 
-        $rowCounter++;
-    }
-    ?>
-</tr>
-</table>
+        </td>
+        </tr>
 
-</td>
-</tr>
-</table>
+        <tr>
+        <td class="borderTop alignTop"><b><?php echo $hesklang['sort_by']; ?></b>: &nbsp; </td>
+        <td class="borderTop">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+        <td width="33%"><label><input type="radio" name="sort" value="priority"  <?php if ($sort == 'priority') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['priority']; ?></label></td>
+        <td width="33%"><label><input type="radio" name="sort" value="lastchange" <?php if ($sort == 'lastchange') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['last_update']; ?></label></td>
+        <td width="34%"><label><input type="radio" name="sort" value="name" <?php if ($sort == 'name') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['name']; ?></label></td>
+        </tr>
+        <tr>
+        <td width="33%"><label><input type="radio" name="sort" value="subject" <?php if ($sort == 'subject') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['subject']; ?></label></td>
+        <td width="33%"><label><input type="radio" name="sort" value="status" <?php if ($sort == 'status') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['status']; ?></label></td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        </table>
 
-<div id="topSubmit" style="display:<?php echo $more ? 'none' : 'block' ; ?>">
-&nbsp;<br />
-<input class="btn btn-default" type="submit" value="<?php echo $hesklang['show_tickets']; ?>" />
-<a class="btn btn-default" href="javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('divShow');Javascript:hesk_toggleLayerDisplay('topSubmit');document.showt.more.value='1';"><?php echo $hesklang['mopt']; ?></a>
-<br />&nbsp;<br />
+        </td>
+        </tr>
+
+        <tr>
+        <td class="borderTop alignTop"><b><?php echo $hesklang['gb']; ?></b>: &nbsp; </td>
+        <td class="borderTop">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+        <td width="33%"><label><input type="radio" name="g" value=""  <?php if ( ! $group) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['dg']; ?></label></td>
+        <td width="33%"><?php
+        if ($can_view_unassigned || $can_view_ass_others)
+        {
+            ?>
+            <label><input type="radio" name="g" value="owner" <?php if ($group == 'owner') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['owner']; ?></label>
+            <?php
+        }
+        else
+        {
+            echo '&nbsp;';
+        }
+        ?>
+        </td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        <tr>
+        <td width="33%"><label><input type="radio" name="g" value="category" <?php if ($group == 'category') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['category']; ?></label></td>
+        <td width="33%"><label><input type="radio" name="g" value="priority" <?php if ($group == 'priority') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['priority']; ?></label></td>
+        <td width="34%">&nbsp;</td>
+        </tr>
+        </table>
+
+        </td>
+        </tr>
+
+        <tr>
+        <td class="borderTop alignMiddle"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
+        <td class="borderTop alignMiddle">
+        <div class="col-md-4" style="padding-left: 0px"><select class="form-control" name="category">
+        <option value="0" ><?php echo $hesklang['any_cat']; ?></option>
+        <?php echo $category_options; ?>
+        </select></div>
+        </td>
+        </tr>
+
+        <tr>
+        <td class="borderTop"><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
+        <td class="borderTop"><div class="col-md-2" style="padding-left: 0px; padding-right:0px"><input type="text" class="form-control" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-3" style="line-height: 40px"><?php echo $hesklang['tickets_page']; ?></div></td>
+        </tr>
+        <tr>
+        <td class="borderTop alignMiddle"><b><?php echo $hesklang['order']; ?></b>: &nbsp; </td>
+        <td class="borderTop alignMiddle">
+        <label><input type="radio" name="asc" value="1" <?php if ($asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['ascending']; ?></label>
+        |
+        <label><input type="radio" name="asc" value="0" <?php if (!$asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['descending']; ?></label></td>
+        </tr>
+
+        <tr>
+        <td class="borderTop alignTop"><b><?php echo $hesklang['opt']; ?></b>: &nbsp; </td>
+        <td class="borderTop">
+
+        <label><input type="checkbox" name="cot" value="1" <?php if ($cot) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['cot']; ?></label><br />
+        <label><input type="checkbox" name="def" value="1" /> <?php echo $hesklang['def']; ?></label> (<a href="admin_main.php?reset=1&amp;token=<?php echo hesk_token_echo(0); ?>"><?php echo $hesklang['redv']; ?></a>)
+
+        </td>
+
+        </table>
+
+        <p><input class="btn btn-default" type="submit" value="<?php echo $hesklang['show_tickets']; ?>" />
+        <input type="hidden" name="more" value="<?php echo $more ? 1 : 0 ; ?>" /><a class="btn btn-default" href="javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('divShow');Javascript:hesk_toggleLayerDisplay('topSubmit');document.showt.more.value='0';"><?php echo $hesklang['lopt']; ?></a></p>
+
+        </div>
+
+        </form>
+
+        </td>
+        </tr>
+        </table>
+    </div>
 </div>
 
-<div id="divShow" style="display:<?php echo $more ? 'block' : 'none' ; ?>">
-
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
-<tr>
-<td width="20%" class="borderTop alignTop"><b><?php echo $hesklang['priority']; ?></b>: &nbsp; </td>
-<td width="80%" class="borderTop alignTop">
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="34%"><label><input type="checkbox" name="p0" value="1" <?php if (isset($priority[0])) {echo 'checked="checked"';} ?> /> <span class="critical"><?php echo $hesklang['critical']; ?></span></label></td>
-<td width="33%"><label><input type="checkbox" name="p2" value="1" <?php if (isset($priority[2])) {echo 'checked="checked"';} ?> /> <span class="medium"><?php echo $hesklang['medium']; ?></span></label></td>
-<td width="33%">&nbsp;</td>
-</tr>
-<tr>
-<td width="34%"><label><input type="checkbox" name="p1" value="1" <?php if (isset($priority[1])) {echo 'checked="checked"';} ?> /> <span class="important"><?php echo $hesklang['high']; ?></span></label></td>
-<td width="33%"><label><input type="checkbox" name="p3" value="1" <?php if (isset($priority[3])) {echo 'checked="checked"';} ?> /> <span class="normal"><?php echo $hesklang['low']; ?></span></label></td>
-<td width="33%">&nbsp;</td>
-</tr>
-</table>
-
-</td>
-</tr>
-
-<tr>
-<td class="borderTop alignTop"><b><?php echo $hesklang['show']; ?></b>: &nbsp; </td>
-<td class="borderTop">
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="34%" class="alignTop">
-<label><input type="checkbox" name="s_my" value="1" <?php if ($s_my[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_my']; ?></label>
-<?php
-if ($can_view_unassigned)
-{
-	?>
-    <br />
-	<label><input type="checkbox" name="s_un" value="1" <?php if ($s_un[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_un']; ?></label>
-	<?php
-}
-?>
-</td>
-<td width="33%" class="alignTop">
-<?php
-if ($can_view_ass_others)
-{
-	?>
-	<label><input type="checkbox" name="s_ot" value="1" <?php if ($s_ot[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_ot']; ?></label>
-    <br />
-	<?php
-}
-?>
-<label><input type="checkbox" name="archive" value="1" <?php if ($archive[1]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['disp_only_archived']; ?></label></td>
-<td width="33%">&nbsp;</td>
-</tr>
-</table>
-
-</td>
-</tr>
-
-<tr>
-<td class="borderTop alignTop"><b><?php echo $hesklang['sort_by']; ?></b>: &nbsp; </td>
-<td class="borderTop">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="34%"><label><input type="radio" name="sort" value="priority"  <?php if ($sort == 'priority') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['priority']; ?></label></td>
-<td width="33%"><label><input type="radio" name="sort" value="lastchange" <?php if ($sort == 'lastchange') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['last_update']; ?></label></td>
-<td width="33%"><label><input type="radio" name="sort" value="name" <?php if ($sort == 'name') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['name']; ?></label></td>
-</tr>
-<tr>
-<td width="34%"><label><input type="radio" name="sort" value="subject" <?php if ($sort == 'subject') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['subject']; ?></label></td>
-<td width="33%"><label><input type="radio" name="sort" value="status" <?php if ($sort == 'status') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['status']; ?></label></td>
-<td width="33%">&nbsp;</td>
-</tr>
-</table>
-
-</td>
-</tr>
-
-<tr>
-<td class="borderTop alignTop"><b><?php echo $hesklang['gb']; ?></b>: &nbsp; </td>
-<td class="borderTop">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td width="34%"><label><input type="radio" name="g" value=""  <?php if ( ! $group) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['dg']; ?></label></td>
-<td width="33%"><?php
-if ($can_view_unassigned || $can_view_ass_others)
-{
-	?>
-	<label><input type="radio" name="g" value="owner" <?php if ($group == 'owner') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['owner']; ?></label>
-	<?php
-}
-else
-{
-	echo '&nbsp;';
-}
-?>
-</td>
-<td width="33%">&nbsp;</td>
-</tr>
-<tr>
-<td width="34%"><label><input type="radio" name="g" value="category" <?php if ($group == 'category') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['category']; ?></label></td>
-<td width="33%"><label><input type="radio" name="g" value="priority" <?php if ($group == 'priority') {echo 'checked="checked"';} ?> /> <?php echo $hesklang['priority']; ?></label></td>
-<td width="33%">&nbsp;</td>
-</tr>
-</table>
-
-</td>
-</tr>
-
-<tr>
-<td class="borderTop alignMiddle"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
-<td class="borderTop alignMiddle">
-<div class="col-md-4" style="padding-left: 0px"><select class="form-control" name="category">
-<option value="0" ><?php echo $hesklang['any_cat']; ?></option>
-<?php echo $category_options; ?>
-</select></div>
-</td>
-</tr>
-
-<tr>
-<td class="borderTop"><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
-<td class="borderTop"><div class="col-md-2" style="padding-left: 0px; padding-right:0px"><input type="text" class="form-control" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-3" style="line-height: 40px"><?php echo $hesklang['tickets_page']; ?></div></td>
-</tr>
-<tr>
-<td class="borderTop alignMiddle"><b><?php echo $hesklang['order']; ?></b>: &nbsp; </td>
-<td class="borderTop alignMiddle">
-<label><input type="radio" name="asc" value="1" <?php if ($asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['ascending']; ?></label>
-|
-<label><input type="radio" name="asc" value="0" <?php if (!$asc) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['descending']; ?></label></td>
-</tr>
-
-<tr>
-<td class="borderTop alignTop"><b><?php echo $hesklang['opt']; ?></b>: &nbsp; </td>
-<td class="borderTop">
-
-<label><input type="checkbox" name="cot" value="1" <?php if ($cot) {echo 'checked="checked"';} ?> /> <?php echo $hesklang['cot']; ?></label><br />
-<label><input type="checkbox" name="def" value="1" /> <?php echo $hesklang['def']; ?></label> (<a href="admin_main.php?reset=1&amp;token=<?php echo hesk_token_echo(0); ?>"><?php echo $hesklang['redv']; ?></a>)
-
-</td>
-
-</table>
-
-<p><input class="btn btn-default" type="submit" value="<?php echo $hesklang['show_tickets']; ?>" />
-<input type="hidden" name="more" value="<?php echo $more ? 1 : 0 ; ?>" /><a class="btn btn-default" href="javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay('divShow');Javascript:hesk_toggleLayerDisplay('topSubmit');document.showt.more.value='0';"><?php echo $hesklang['lopt']; ?></a></p>
-
-</div>
-
-</form>
-
-</td>
-</tr>
-</table>
-
 <!-- ** END SHOW TICKET FORM ** -->
 <div class="blankSpace"></div>
 
 <!-- ** START SEARCH TICKETS FORM ** -->
-
+<div class="panel panel-default">
+<div class="panel-heading">
+    <h4><?php echo $hesklang['find_ticket_by']; ?></h4>
+</div>
+<div class="panel-body">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td valign="top">
 
 <form class="form-inline" action="find_tickets.php" method="get" name="findby" id="findby">
-<h3 style="margin-bottom:5px"><?php echo $hesklang['find_ticket_by']; ?></h3>
-<div class="footerWithBorder blankSpace"></div>
 
-<table border="0" cellpadding="3" cellspacing="0">
+<table class="table" style="width: auto" border="0" cellpadding="3" cellspacing="0">
 <tr>
-<td style="text-align:left">
+<td style="text-align:left; border-top: 0px">
 <b style="color: #000"><?php echo $hesklang['s_for']; ?></b><br />
 <input class="form-control" type="text" name="q" size="30" <?php if (isset($q)) {echo 'value="'.$q.'"';} ?> />
 </td>
-<td style="text-align:left">
+<td style="text-align:left; border-top: 0px">
 <b style="color: #000"><?php echo $hesklang['s_in']; ?></b><br />
 <select class="form-control" name="what">
 <option value="trackid" <?php if ($what=='trackid') {echo 'selected="selected"';} ?> ><?php echo $hesklang['trackID']; ?></option>
@@ -367,10 +371,10 @@ echo '<option value="'.$k.'" '.$selected.'>'.$v['name'].'</option>';
 
 &nbsp;<br />
 
-<table border="0" cellpadding="3" cellspacing="0" width="100%">
+<table class="table table-striped" border="0" cellpadding="3" cellspacing="0" width="100%">
 <tr>
-<td class="borderTop alignMiddle" width="20%"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
-<td class="borderTop alignMiddle" width="80%">
+<td class="alignMiddle" width="20%"><b><?php echo $hesklang['category']; ?></b>: &nbsp; </td>
+<td class="alignMiddle" width="80%">
 <select class="form-control" name="category">
 <option value="0" ><?php echo $hesklang['any_cat']; ?></option>
 <?php echo $category_options; ?>
@@ -378,14 +382,14 @@ echo '<option value="'.$k.'" '.$selected.'>'.$v['name'].'</option>';
 </td>
 </tr>
 <tr>
-<td class="borderTop alignMiddle"><b><?php echo $hesklang['date']; ?></b>: &nbsp; </td>
-<td class="borderTop alignMiddle">
+<td class="alignMiddle"><b><?php echo $hesklang['date']; ?></b>: &nbsp; </td>
+<td class="alignMiddle">
 <div class="col-md-3" style="padding-left: 0px"><input class="form-control tcal" type="text" name="dt" id="dt" size="10" <?php if ($date_input) {echo 'value="'.$date_input.'"';} ?> /></div>
 </td>
 </tr>
 <tr>
-<td class="borderTop alignTop"><b><?php echo $hesklang['s_incl']; ?></b>: &nbsp; </td>
-<td class="borderTop">
+<td class="alignTop"><b><?php echo $hesklang['s_incl']; ?></b>: &nbsp; </td>
+<td>
 <label><input type="checkbox" name="s_my" value="1" <?php if ($s_my[2]) echo 'checked="checked"'; ?> /> <?php echo $hesklang['s_my']; ?></label>
 <?php
 if ($can_view_ass_others)
@@ -409,8 +413,8 @@ if ($can_view_unassigned)
 </td>
 </tr>
 <tr>
-<td class="borderTop"><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
-<td class="borderTop"><div class="col-md-2" style="padding-left: 0px; padding-right: 0px"><input class="form-control" type="text" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-10" style="line-height: 40px"><?php echo $hesklang['results_page']; ?></div></td>
+<td><b><?php echo $hesklang['display']; ?></b>: &nbsp; </td>
+<td><div class="col-md-2" style="padding-left: 0px; padding-right: 0px; text-align:right"><input class="form-control" type="text" name="limit" value="<?php echo $maxresults; ?>" size="4" /></div><div class="col-md-10" style="line-height: 40px"><?php echo $hesklang['results_page']; ?></div></td>
 </tr>
 </table>
 
@@ -423,6 +427,8 @@ if ($can_view_unassigned)
 </td>
 </tr>
 </table>
+</div>
+</div>
 
 <!-- ** END SEARCH TICKETS FORM ** -->
 
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index 93d20934..7c83845d 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -61,6 +61,8 @@ $mysql_time = hesk_dbTime();
 $result = hesk_dbQuery($sql_count);
 $total  = hesk_dbResult($result);
 
+//-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
+echo '<div class="panel-body">';
 if ($total > 0)
 {
 
@@ -112,13 +114,11 @@ if ($total > 0)
 
 	$prev_page = ($page - 1 <= 0) ? 0 : $page - 1;
 	$next_page = ($page + 1 > $pages) ? 0 : $page + 1;
+    
+    echo sprintf($hesklang['tickets_on_pages'],$total,$pages).' <br />';
 
-	if ($pages > 1)
+    if ($pages > 1)
 	{
-        //-- Precondition: The panel has already been created, and there is NO open <div class="panel-body"> tag yet.
-		echo '
-            <div class="panel-body">
-                '.sprintf($hesklang['tickets_on_pages'],$total,$pages).' <br />';
                 
 		/* List pages */
         echo '<div class="row">
@@ -166,16 +166,18 @@ if ($total > 0)
 		}
         echo ' </ul>
                </div>
-               <div class="col-md-6 col-sm-12" style="text-align: right">'.$hesklang['jump_page'].'
-                    <select class="form-control" name="myHpage" id="myHpage">';
+               <div class="col-md-6 col-sm-12" style="text-align: left">
+                    <div class="form-inline">'.$hesklang['jump_page'].'
+                    <select class="form-control" name="myHpage" id="myHpage" onchange="javascript:window.location=\''.$href.'?'.$query.'\'+document.getElementById(\'myHpage\').value">';
                 for ($i=1;$i<=$pages;$i++)
                 {
                     $tmp = ($page == $i) ? ' selected="selected"' : '';
                     echo '<option value="'.$i.'"'.$tmp.'>'.$i.'</option>';
                 }
-                echo'</select> <input type="button" value="'.$hesklang['go'].'" onclick="javascript:window.location=\''.$href.'?'.$query.'\'+document.getElementById(\'myHpage\').value" class="btn btn-default btn-xs" />
+                echo'</select>
                 </div>
-             </div></span>';
+             </div>
+         </div>';
 
 	}
 
@@ -240,7 +242,6 @@ if ($total > 0)
     }
 
 	$i = 0;
-	$checkall = '<input type="checkbox" name="checkall" value="2" onclick="hesk_changeAll()" />';
 
     $group_tmp = '';
 	$is_table = 0;
@@ -260,7 +261,7 @@ if ($total > 0)
         $first_line = '(' . $hesklang['unas'] . ')'." \n\n";
 		if ($ticket['owner'] == $_SESSION['id'])
 		{
-			$owner = '<span class="assignedyou" title="'.$hesklang['tasy2'].'"><span class="glyphicon glyphicon-user"></span></span> ';
+			$owner = '<span class="assignedyou" title="'.$hesklang['tasy2'].'"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="'.$hesklang['tasy2'].'"></span></span> ';
             $first_line = $hesklang['tasy2'] . " \n\n";
 		}
 		elseif ($ticket['owner'])
@@ -269,14 +270,14 @@ if ($total > 0)
             {
             	$admins[$ticket['owner']] = $hesklang['e_udel'];
             }
-			$owner = '<span class="assignedother" title="'.$hesklang['taso3'] . ' ' . $admins[$ticket['owner']] .'"><span class="glyphicon glyphicon-user"></span></span> ';
+			$owner = '<span class="assignedother" title="'.$hesklang['taso3'] . ' ' . $admins[$ticket['owner']] .'"><span class="glyphicon glyphicon-user" data-toggle="tooltip" data-placement="top" title="'.$hesklang['taso3'].' '.$admins[$ticket['owner']].'"></span></span> ';
             $first_line = $hesklang['taso3'] . ' ' . $admins[$ticket['owner']] . " \n\n";
 		}
 
         $tagged = '';
         if ($ticket['archive'])
         {
-			$tagged = '<i class="fa fa-tag"></i> ';
+			$tagged = '<i class="fa fa-tag" data-toggle="tooltip" data-placement="top" title="'.$hesklang['archived2'].'"></i> ';
         }
 
         $statusName = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `ShortNameContentKey`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status']));
@@ -293,7 +294,7 @@ if ($total > 0)
 				$color = 'warning';
                 break;
 			case 2:
-				$ticket['priority']='<span style="color: green; font-size:1.3em" class="glyphicon glyphicon-flag" data-toggle="tooltip" data-placement="top" title="'.$hesklang['medium '].'"></span>';
+				$ticket['priority']='<span style="color: green; font-size:1.3em" class="glyphicon glyphicon-flag" data-toggle="tooltip" data-placement="top" title="'.$hesklang['medium'].'"></span>';
 				break;
 			default:
 				$ticket['priority']='<span style="color: blue; font-size:1.3em" class="glyphicon glyphicon-flag" data-toggle="tooltip" data-placement="top" title="'.$hesklang['low'].'"></span>';
@@ -315,8 +316,8 @@ if ($total > 0)
 		$ticket['message'] = $first_line . substr(strip_tags($ticket['message']),0,200).'...';
 
 		echo <<<EOC
-		<tr class="$color" title="$ticket[message]">
-		<td><input type="checkbox" name="id[]" value="$ticket[id]" />&nbsp;</td>
+		<tr class="$color" id="$ticket[id]" title="$ticket[message]">
+		<td><input type="checkbox" id="check$ticket[id]" name="id[]" value="$ticket[id]" />&nbsp;</td>
 		<td><a href="admin_ticket.php?track=$ticket[trackid]&amp;Refresh=$random">$ticket[trackid]</a></td>
 		<td>$ticket[lastchange]</td>
 		<td>$ticket[name]</td>
@@ -336,28 +337,6 @@ EOC;
 
     <table border="0" width="100%">
     <tr>
-    <td width="50%" style="text-align:left;vertical-align:top">
-	    <?php
-	    if (hesk_checkPermission('can_add_archive',0))
-	    {
-		    ?>
-			<i class="fa fa-tag"></i> <?php echo $hesklang['archived2']; ?>&nbsp;&nbsp;
-		    <?php
-	    }
-	    ?>
-
-	    <span class="assignedyou"><span class="glyphicon glyphicon-user"></span></span> <?php echo $hesklang['tasy2']; ?>&nbsp;&nbsp;
-
-	    <?php
-	    if (hesk_checkPermission('can_view_ass_others',0))
-	    {
-		    ?>
-			<span class="assignedother"><span class="glyphicon glyphicon-user"></span></span> <?php echo $hesklang['taso2']; ?>
-		    <?php
-	    }
-	    ?>
-        &nbsp;
-    </td>
     <td width="50%" style="text-align:right;vertical-align:top">
 		<select class="form-control" name="a">
 		<option value="close" selected="selected"><?php echo $hesklang['close_selected']; ?></option>
@@ -396,6 +375,8 @@ EOC;
     </table>
 
 	</form>
+    </div>
+    </div>
 	<?php
 
 } // END ticket list if total > 0
@@ -421,10 +402,10 @@ function hesk_print_list_head()
 	global $href, $query, $sort_possible, $hesklang;
 	?>
 	<div align="center">
-	<table class="table table-hover">
+	<table id="ticket-table" class="table table-hover">
         <thead>
 	        <tr>
-	        <th><input type="checkbox" name="checkall" value="2" onclick="hesk_changeAll(this)" /></th>
+	        <th><input type="checkbox" id="checkall" name="checkall" value="2" onclick="hesk_changeAll(this)" /></th>
 	        <th><a href="<?php echo $href . '?' . $query . $sort_possible['trackid'] . '&amp;sort='; ?>trackid"><?php echo $hesklang['trackID']; ?></a></th>
 	        <th><a href="<?php echo $href . '?' . $query . $sort_possible['lastchange'] . '&amp;sort='; ?>lastchange"><?php echo $hesklang['last_update']; ?></a></th>
 	        <th><a href="<?php echo $href . '?' . $query . $sort_possible['name'] . '&amp;sort='; ?>name"><?php echo $hesklang['name']; ?></a></th>