diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 3c17af29..752d959b 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -107,202 +107,198 @@ myField.value += myValue;
     $j=0;
     $num = hesk_dbNumRows($result);  
 ?>
+<div class="row" style="margin-top: 20px">
+    <div class="col-md-4">
+        <div class="panel panel-default">
+            <div class="panel-heading"><?php echo $hesklang['savedResponses']; ?></div>
+            <div class="panel-body">
+                <?php if ($num < 1)
+                {
+                    echo '<p>'.$hesklang['no_saved'].'</p>';
+                }
+                else
+                { ?>
+                <table class="table table-hover">
+                    <tr>
+                    <th><?php echo $hesklang['saved_title']; ?></th>
+                    <th><?php echo $hesklang['opt']; ?></th>
+                    </tr>
+                    <?php
 
-<div class="enclosingDashboard" style="padding-top: 20px">
-    <div class="row">
-        <div class="col-md-5">
-            <div class="moreToLeft">
-                <ul class="nav nav-tabs">
-				    <li class="active"><a href="#" onclick="return false;"><?php echo $hesklang['savedResponses']; ?></a></li>
-			    </ul>
-                <div class="summaryList">
-                    <div class="viewTicketSidebar">
-                    <?php if ($num < 1)
+                    while ($mysaved=hesk_dbFetchAssoc($result))
                     {
-                        echo '<p>'.$hesklang['no_saved'].'</p>';
-                    }
-                    else
-                    { ?>
-                    <table class="table table-hover">
-	                    <tr>
-	                    <th><?php echo $hesklang['saved_title']; ?></th>
-	                    <th><?php echo $hesklang['opt']; ?></th>
-	                    </tr>
-	                    <?php
+                        $j++;
 
-                        while ($mysaved=hesk_dbFetchAssoc($result))
+                        if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2'])
                         {
-    	                    $j++;
-
-		                    if (isset($_SESSION['canned']['selcat2']) && $mysaved['id'] == $_SESSION['canned']['selcat2'])
-		                    {
-			                    $color = 'admin_green';
-			                    unset($_SESSION['canned']['selcat2']);
-		                    }
-		                    else
-		                    {
-			                    $color = $i ? 'admin_white' : 'admin_gray';
-		                    }
-        
-		                    $tmp   = $i ? 'White' : 'Blue';
-	                        $style = 'class="option'.$tmp.'OFF" onmouseover="this.className=\'option'.$tmp.'ON\'" onmouseout="this.className=\'option'.$tmp.'OFF\'"';
-	                        $i     = $i ? 0 : 1;
-
-                            $options .= '<option value="'.$mysaved['id'].'"';
-                            $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
-                            $options .= '>'.$mysaved['title'].'</option>';
-
-
-                            $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
-                            $javascript_titles.='myTitle['.$mysaved['id'].']=\''.addslashes($mysaved['title'])."';\n";
-
-	                        echo '
-	                        <tr>
-	                        <td>'.$mysaved['title'].'</td>
-                            <td>
-                            ';
-
-                            if ($num > 1)
-                            {
-        	                    if ($j == 1)
-                                {
-            	                    echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green"></i></a>';
-                                }
-                                elseif ($j == $num)
-                                {
-            	                    echo'<a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
-                                }
-                                else
-                                {
-            	                    echo'
-			                        <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green"></i></a>
-			                        <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green"></i></a>
-                                    ';
-                                }
-                            }
-                            else
-                            {
-        	                    echo '';
-                            }
-
-                            echo '
-                            <a href="manage_canned.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"><i class="fa fa-times" style="font-size: 14px; color: #FF0000"></i></a>&nbsp;</td>
-	                        </tr>
-		                    ';
-                        } // End while
-                    }
-                        ?>
-	                    </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-7">
-            <script language="javascript" type="text/javascript"><!--
-            var myMsgTxt = new Array();
-            myMsgTxt[0]='';
-            var myTitle = new Array();
-            myTitle[0]='';
-
-            <?php
-            echo $javascript_titles;
-            echo $javascript_messages;
-            ?>
-
-            function setMessage(msgid) {
-                if (document.getElementById) {
-                    document.getElementById('HeskMsg').innerHTML='<textarea class="form-control" name="msg" rows="15" cols="70">'+myMsgTxt[msgid]+'</textarea>';
-                    document.getElementById('HeskTitle').innerHTML='<input type="text" class="form-control" name="name" size="40" maxlength="50" value="'+myTitle[msgid]+'">';
-                } else {
-                    document.form1.msg.value=myMsgTxt[msgid];
-                    document.form1.name.value=myTitle[msgid];
-                }
-
-                if (msgid==0) {
-                    document.form1.a[0].checked=true;
-                } else {
-                    document.form1.a[1].checked=true;
-                }
-            }
-            //-->
-            </script>
-
-            <?php
-            /* This will handle error, success and notice messages */
-            hesk_handle_messages();
-            ?>
-            <h3><?php echo $hesklang['manage_saved']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['manage_intro']); ?>')"><i class="fa fa-question-circle" style="color:black"></i></a></h3>
-            <div class="footerWithBorder blankSpace"></div>
-
-            <form action="manage_canned.php" method="post" name="form1" class="form-horizontal" role="form">
-                <h3><?php echo $hesklang['new_saved']; ?></h3>
-                <div class="footerWithBorder blankSpace"></div>
-                <div class="form-group">
-                    <div class="col-sm-12">
-                        <?php
-                        if ($num > 0)
-                        {
-	                        ?>
-		                    <div class="radio">
-                                <label><input type="radio" name="a" value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_add']; ?></label>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="radio">
-                                        <label><input type="radio" name="a" value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_edit']; ?></label>:
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <select class="form-control" name="saved_replies" onchange="setMessage(this.value)"><option value="0"> - <?php echo $hesklang['select_empty']; ?> - </option><?php echo $options; ?></select>
-                                </div>
-                            </div>
-	                        <?php
+                            $color = 'admin_green';
+                            unset($_SESSION['canned']['selcat2']);
                         }
                         else
                         {
-    	                    echo '<input type="hidden" name="a" value="new" /><label> ' . $hesklang['canned_add'] . '</label>';
+                            $color = $i ? 'admin_white' : 'admin_gray';
                         }
-                        ?>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['saved_title']; ?>:</label>
-                    <div class="col-sm-10">
-                        <span id="HeskTitle"><input class="form-control" placeholder="<?php echo $hesklang['saved_title']; ?>" type="text" name="name" size="40" maxlength="50" <?php if (isset($_SESSION['canned']['name'])) {echo ' value="'.stripslashes($_SESSION['canned']['name']).'" ';} ?> /></span>     
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?>:</label>
-                    <div class="col-sm-10">
-                        <span id="HeskMsg">
-                            <textarea class="form-control" placeholder="<?php echo $hesklang['message']; ?>" name="msg" rows="15" cols="70"><?php
-                                    if (isset($_SESSION['canned']['msg']))
-                                    {
-    	                                echo stripslashes($_SESSION['canned']['msg']);
-                                    }
-                                ?></textarea>
-                            <?php echo $hesklang['insert_special']; ?>:
-	                        <a href="javascript:void(0)" onclick="hesk_insertTag('HESK_NAME')"><?php echo $hesklang['name']; ?></a> |
-	                        <a href="javascript:void(0)" onclick="hesk_insertTag('HESK_EMAIL')"><?php echo $hesklang['email']; ?></a>
-	                        <?php
-	                            foreach ($hesk_settings['custom_fields'] as $k=>$v)
-	                            {
-	                                if ($v['use'])
-	                                {
-	                                    echo '| <a href="javascript:void(0)" onclick="hesk_insertTag(\'HESK_'.$k.'\')">'.$v['name'].'</a> ';
-	                                }
-	                            }
-	                        ?> 
-                        </span>         
-                    </div>     
-                </div>
-                <div class="form-group" style="text-align: center">
-                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
-                    <input type="submit" value="<?php echo $hesklang['save_reply']; ?>" class="btn btn-default" />   
-                </div>          
-            </form>
+
+                        $tmp   = $i ? 'White' : 'Blue';
+                        $style = 'class="option'.$tmp.'OFF" onmouseover="this.className=\'option'.$tmp.'ON\'" onmouseout="this.className=\'option'.$tmp.'OFF\'"';
+                        $i     = $i ? 0 : 1;
+
+                        $options .= '<option value="'.$mysaved['id'].'"';
+                        $options .= (isset($_SESSION['canned']['id']) && $_SESSION['canned']['id'] == $mysaved['id']) ? ' selected="selected" ' : '';
+                        $options .= '>'.$mysaved['title'].'</option>';
+
+
+                        $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
+                        $javascript_titles.='myTitle['.$mysaved['id'].']=\''.addslashes($mysaved['title'])."';\n";
+
+                        echo '
+                        <tr>
+                        <td>'.$mysaved['title'].'</td>
+                        <td>
+                        ';
+
+                        if ($num > 1)
+                        {
+                            if ($j == 1)
+                            {
+                                echo'<img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" /> <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green"></i></a>';
+                            }
+                            elseif ($j == $num)
+                            {
+                                echo'<a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green"></i></a> <img src="../img/blank.gif" width="16" height="16" alt="" style="padding:3px;border:none;" />';
+                            }
+                            else
+                            {
+                                echo'
+                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=-15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_up'].'"><i class="fa fa-arrow-up" style="font-size: 14px; color: green"></i></a>
+                                <a href="manage_canned.php?a=order&amp;replyid='.$mysaved['id'].'&amp;move=15&amp;token='.hesk_token_echo(0).'" data-toggle="tooltip" data-placement="top" title="'.$hesklang['move_dn'].'"><i class="fa fa-arrow-down" style="font-size: 14px; color: green"></i></a>
+                                ';
+                            }
+                        }
+                        else
+                        {
+                            echo '';
+                        }
+
+                        echo '
+                        <a href="manage_canned.php?a=remove&amp;id='.$mysaved['id'].'&amp;token='.hesk_token_echo(0).'" onclick="return confirm_delete();" data-toggle="tooltip" data-placement="top" title="'.$hesklang['delete'].'"><i class="fa fa-times" style="font-size: 14px; color: #FF0000"></i></a>&nbsp;</td>
+                        </tr>
+                        ';
+                    } // End while
+                }
+                    ?>
+                </table>
+            </div>
         </div>
     </div>
+    <div class="col-md-8">
+        <script language="javascript" type="text/javascript"><!--
+        var myMsgTxt = new Array();
+        myMsgTxt[0]='';
+        var myTitle = new Array();
+        myTitle[0]='';
+
+        <?php
+        echo $javascript_titles;
+        echo $javascript_messages;
+        ?>
+
+        function setMessage(msgid) {
+            if (document.getElementById) {
+                document.getElementById('HeskMsg').innerHTML='<textarea class="form-control" name="msg" rows="15" cols="70">'+myMsgTxt[msgid]+'</textarea>';
+                document.getElementById('HeskTitle').innerHTML='<input type="text" class="form-control" name="name" size="40" maxlength="50" value="'+myTitle[msgid]+'">';
+            } else {
+                document.form1.msg.value=myMsgTxt[msgid];
+                document.form1.name.value=myTitle[msgid];
+            }
+
+            if (msgid==0) {
+                document.form1.a[0].checked=true;
+            } else {
+                document.form1.a[1].checked=true;
+            }
+        }
+        //-->
+        </script>
+
+        <?php
+        /* This will handle error, success and notice messages */
+        hesk_handle_messages();
+        ?>
+        <h3><?php echo $hesklang['manage_saved']; ?> <a href="javascript:void(0)" onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['manage_intro']); ?>')"><i class="fa fa-question-circle" style="color:black"></i></a></h3>
+        <div class="footerWithBorder blankSpace"></div>
+
+        <form action="manage_canned.php" method="post" name="form1" class="form-horizontal" role="form">
+            <h3><?php echo $hesklang['new_saved']; ?></h3>
+            <div class="footerWithBorder blankSpace"></div>
+            <div class="form-group">
+                <div class="col-sm-12">
+                    <?php
+                    if ($num > 0)
+                    {
+                        ?>
+                        <div class="col-sm-12">
+                            <div class="radio">
+                                <label><input type="radio" name="a" value="new" <?php echo (!isset($_SESSION['canned']['what']) || $_SESSION['canned']['what'] != 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_add']; ?></label>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-6">
+                                <div class="radio">
+                                    <label><input type="radio" name="a" value="edit" <?php echo (isset($_SESSION['canned']['what']) && $_SESSION['canned']['what'] == 'EDIT') ? 'checked="checked"' : ''; ?> /> <?php echo $hesklang['canned_edit']; ?></label>:
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <select class="form-control" name="saved_replies" onchange="setMessage(this.value)"><option value="0"> - <?php echo $hesklang['select_empty']; ?> - </option><?php echo $options; ?></select>
+                            </div>
+                        </div>
+                        <?php
+                    }
+                    else
+                    {
+                        echo '<input type="hidden" name="a" value="new" /><label> ' . $hesklang['canned_add'] . '</label>';
+                    }
+                    ?>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="name" class="col-sm-2 control-label"><?php echo $hesklang['saved_title']; ?>:</label>
+                <div class="col-sm-10">
+                    <span id="HeskTitle"><input class="form-control" placeholder="<?php echo $hesklang['saved_title']; ?>" type="text" name="name" size="40" maxlength="50" <?php if (isset($_SESSION['canned']['name'])) {echo ' value="'.stripslashes($_SESSION['canned']['name']).'" ';} ?> /></span>     
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="msg" class="col-sm-2 control-label"><?php echo $hesklang['message']; ?>:</label>
+                <div class="col-sm-10">
+                    <span id="HeskMsg">
+                        <textarea class="form-control" placeholder="<?php echo $hesklang['message']; ?>" name="msg" rows="15" cols="70"><?php
+                                if (isset($_SESSION['canned']['msg']))
+                                {
+                                    echo stripslashes($_SESSION['canned']['msg']);
+                                }
+                            ?></textarea>
+                        <?php echo $hesklang['insert_special']; ?>:
+                        <a href="javascript:void(0)" onclick="hesk_insertTag('HESK_NAME')"><?php echo $hesklang['name']; ?></a> |
+                        <a href="javascript:void(0)" onclick="hesk_insertTag('HESK_EMAIL')"><?php echo $hesklang['email']; ?></a>
+                        <?php
+                            foreach ($hesk_settings['custom_fields'] as $k=>$v)
+                            {
+                                if ($v['use'])
+                                {
+                                    echo '| <a href="javascript:void(0)" onclick="hesk_insertTag(\'HESK_'.$k.'\')">'.$v['name'].'</a> ';
+                                }
+                            }
+                        ?> 
+                    </span>         
+                </div>     
+            </div>
+            <div class="form-group" style="text-align: center">
+                <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>" />
+                <input type="submit" value="<?php echo $hesklang['save_reply']; ?>" class="btn btn-default" />   
+            </div>          
+        </form>
+    </div>
+</div>
 
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');