diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index c0801a77..bddea72b 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="addTicketModal" tabindex="-1">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
         <h5 class="modal-title"><i class="fa fa-fw fa-tag mr-2"></i>New Ticket</h5>
@@ -49,7 +49,7 @@
           
           <div class="form-group">
             <label>Details <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="8" name="details"></textarea>
+            <textarea class="form-control summernote" rows="8" name="details"></textarea>
           </div>
 
         </div>
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 5aa98d32..819fd05d 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -14,6 +14,9 @@
             <li class="nav-item">
               <a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" id="pills-assign-tab" data-toggle="pill" href="#pills-assign">Assign</a>
+            </li>
             <li class="nav-item">
               <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes">Notes</a>
             </li>
@@ -125,6 +128,28 @@
               </div>
             </div>
 
+            <div class="tab-pane fade" id="pills-assign">
+
+              <?php
+              $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, transfers WHERE account_id = 1 AND ");
+
+              while($row = mysqli_fetch_array($sql_payments)){
+                $payment_id = $row['payment_id'];
+                $payment_method = $row['payment_method'];
+                $payment_amount = $row['payment_amount'];
+              ?>
+
+                <div class="form-check">
+                  <input type="checkbox" class="form-check-input" name="payments[]" value="<?php echo $payment_id; ?>">
+                  <label class="form-check-label"><?php echo $payment_method - $payment_amount; ?></label>
+                </div>
+
+              <?php
+              }
+              ?>
+
+            </div>
+
             <div class="tab-pane fade" id="pills-notes">
               
               <div class="form-group">
diff --git a/ticket.php b/ticket.php
index f1eb0074..a5143070 100644
--- a/ticket.php
+++ b/ticket.php
@@ -67,27 +67,40 @@ if(isset($_GET['ticket_id'])){
   </li>
   <li class="breadcrumb-item active">Ticket Details</li>
 </ol>
+
+<div class="row mb-3">
+  <div class="col-9">
+
+    <h3>
+      Ticket <?php echo $ticket_number; ?>
+      <span class="p-2 badge badge-<?php echo $ticket_badge_color; ?>">
+        <?php echo $ticket_status; ?>
+      </span>
+    </h3>
+  </div>
+  <div class="col-3">
+
+    <div class="dropdown dropleft text-center">
+      <button class="btn btn-secondary btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+        <i class="fas fa-fw fa-ellipsis-v"></i>
+      </button>
+      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+        <a class="dropdown-item" href="client_print.php?client_id=<?php echo $client_id; ?>">Print</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
+        <a class="dropdown-item" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="row">
 
   <div class="col-md-9">
 
-    <button class="btn btn-primary">Responses (0)</button>
-    <button class="btn btn-primary">Internal (2)</button>
-
-    <div class="card mb-3 mt-3">
-      <div class="card-header">
+    <div class="card mb-3">
+      <div class="card-header bg-dark">
         <h6 class="float-left mt-1"><?php echo $ticket_subject; ?></h6>
-        <div class="dropdown dropleft text-center">
-          <button class="btn btn-dark btn-sm float-right" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <i class="fas fa-fw fa-ellipsis-v"></i>
-          </button>
-          <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-            <a class="dropdown-item" href="client_print.php?client_id=<?php echo $client_id; ?>">Print</a>
-            <div class="dropdown-divider"></div>
-            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
-            <a class="dropdown-item" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
-          </div>
-        </div>
       </div>
       <div class="card-body">
         <p><?php echo $ticket_details; ?></p>
@@ -97,10 +110,10 @@ if(isset($_GET['ticket_id'])){
     <form class="mb-3" action="post.php" method="post" autocomplete="off">
       <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
       <div class="form-group">
-        <textarea rows="5" class="form-control" name="ticket_update"></textarea>
+        <textarea class="form-control summernote" name="ticket_update"></textarea>
       </div>
       <button type="submit" name="add_ticket_update" class="btn btn-primary"><i class="fa fa-fw fa-check"></i> Save</button>
-      <button type="submit" name="close_ticket" class="btn btn-secondary float-right">Close Ticket</button> 
+       
     </form>
 
     <?php
@@ -130,21 +143,6 @@ if(isset($_GET['ticket_id'])){
   <div class="col-md-3">
 
     <div class="card mb-3">
-      <div class="card-header">
-        <div class="row">
-          <div class="col-md-6">
-            <h2>
-              Ticket <?php echo $ticket_number; ?>
-            </h2>
-          </div>
-          <div class="col-md-6">
-            <span class="p-2 badge badge-<?php echo $ticket_badge_color; ?>">
-              <?php echo $ticket_status; ?>
-            </span>
-          </div>
-        </div>
-
-      </div>
       <div class="card-body">
   
         <div>  
@@ -177,6 +175,8 @@ if(isset($_GET['ticket_id'])){
       <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
     </div>
 
+    <a href="post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-secondary btn-block">Close Ticket</a>
+
   </div>
 
 </div>
diff --git a/tickets.php b/tickets.php
index a686a2c4..decc7491 100644
--- a/tickets.php
+++ b/tickets.php
@@ -20,6 +20,12 @@
     $q = "";
   }
 
+  if(isset($_GET['status'])){
+    $status = mysqli_real_escape_string($mysqli,$_GET['status']);
+  }else{
+    $status = "";
+  }
+
   if(!empty($_GET['sb'])){
     $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
   }else{
@@ -42,7 +48,8 @@
   $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM tickets, clients
     WHERE tickets.client_id = clients.client_id
     AND tickets.company_id = $session_company_id
-    AND (ticket_id LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%')
+    AND ticket_status LIKE '%$status%'
+    AND (ticket_id LIKE '%$q%' OR client_name LIKE '%$q%' OR ticket_subject LIKE '%$q%')
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -70,11 +77,11 @@
       </div>
       <div class="col-md-6">
         <div class="float-right">
-          <a href="?status=New" class="btn btn-secondary">New</a>
-          <a href="?status=In-Progress" class="btn btn-secondary">In-Progress</a>
-          <a href="?status=On-Hold" class="btn btn-secondary">On-Hold</a>
-          <a href="?status=Resolved" class="btn btn-secondary">Resolved</a>
-          <a href="?status=Closed" class="btn btn-secondary">Closed</a>
+          <a href="?status=Open" class="btn <?php if($status == 'Open'){ echo 'btn-primary'; }else{ echo 'btn-secondary'; } ?>">Open</a>
+          <a href="?status=In-Progress" class="btn <?php if($status == 'In-Progress'){ echo 'btn-primary'; }else{ echo 'btn-secondary'; } ?>">In-Progress</a>
+          <a href="?status=On-Hold" class="btn <?php if($status == 'On-Hold'){ echo 'btn-primary'; }else{ echo 'btn-secondary'; } ?>">On-Hold</a>
+          <a href="?status=Resolved" class="btn <?php if($status == 'Resolved'){ echo 'btn-primary'; }else{ echo 'btn-secondary'; } ?>">Resolved</a>
+          <a href="?status=Closed" class="btn <?php if($status == 'Closed'){ echo 'btn-primary'; }else{ echo 'btn-secondary'; } ?>">Closed</a>
         </div>
       </div>
     </div>