diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index f4f5d72b..236875d2 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -9,130 +9,150 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
+
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-event"><i class="fa fa-fw fa-calendar"></i> Event</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-more"><i class="fa fa-fw fa-info-circle"></i> More</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-attendees"><i class="fa fa-fw fa-users"></i> Attendees</a>
+            </li>
+          </ul>
+
+          <hr>
           
-          <div class="form-group">
-            <label>Calendar <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+          <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-event">
+              
+              <div class="form-group">
+                <label>Title <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Calendar <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <select class="form-control select2" name="calendar" required>
+                    <option value="">- Calendar -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $calendar_id = $row['calendar_id'];
+                      $calendar_name = htmlentities($row['calendar_name']);
+                      $calendar_color = htmlentities($row['calendar_color']);
+                    ?>
+                      <option <?php if($config_default_calendar == $calendar_id){ echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                  <div class="input-group-append">
+                    <button type="button" class="btn btn-dark" data-toggle="modal" data-target="#addQuickCalendarModal"><i class="fas fa-fw fa-plus"></i></button>
+                  </div>
+                </div>
+              </div>
+              
+              <label>Start / End <strong class="text-danger">*</strong></label>
+              <div class="form-row">
+                <div class="col-md-6 mb-3">
+                  <input type="datetime-local" class="form-control form-control-sm" name="start" required>
+                </div>
+                <div class="col-md-6 mb-3">
+                  <input type="datetime-local" class="form-control form-control-sm" name="end" required>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Description</label>
+                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"></textarea>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-more">
+
+              <div class="form-group">
+                <label>Repeat</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
+                  </div>
+                  <select class="form-control select2" name="repeat">
+                    <option value="">Never</option>
+                    <option>Day</option>
+                    <option>Week</option>
+                    <option>Month</option>
+                    <option>Year</option>
+                  </select>
+                </div>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-attendees">
+
+              <?php if(isset($client_id)){ ?>
+
+              <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+
+              <?php }else{ ?>
+
+              <div class="form-group">
+                <label>Client</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <select class="form-control select2" name="client">
+                    <option value="">- Client -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $client_id = $row['client_id'];
+                      $client_name = htmlentities($row['client_name']);
+                      $contact_email = htmlentities($row['contact_email']);
+                    ?>
+                      <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
               </div>
-              <select class="form-control select2" name="calendar" required>
-                <option value="">- Calendar -</option>
-                <?php 
                 
-                $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $calendar_id = $row['calendar_id'];
-                  $calendar_name = htmlentities($row['calendar_name']);
-                  $calendar_color = htmlentities($row['calendar_color']);
-                ?>
-                  <option <?php if($config_default_calendar == $calendar_id){ echo "selected"; } ?> data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> <?php echo $calendar_name; ?>" value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-              <div class="input-group-append">
-                <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#addQuickCalendarModal"><i class="fas fa-fw fa-plus"></i></button>
-              </div>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Title <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
-            </div>
-          </div>
+              <?php } ?>
 
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="3" name="description" placeholder="Enter a description"></textarea>
-          </div>
-          
-          <div class="form-group">
-            <label>Start <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+              <?php if(!empty($config_smtp_host)){ ?>
+              <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
+                <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
               </div>
-              <input type="datetime-local" class="form-control" name="start" required>
+              <?php } ?>
+
             </div>
-          </div>
-          
-          <div class="form-group">
-            <label>End <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
-              </div>
-              <input type="datetime-local" class="form-control" name="end" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Repeat</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
-              </div>
-              <select class="form-control select2" name="repeat">
-                <option value="">Never</option>
-                <option>Day</option>
-                <option>Week</option>
-                <option>Month</option>
-                <option>Year</option>
-              </select>
-            </div>
-          </div>
 
-          <?php if(isset($client_id)){ ?>
-
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-
-          <?php }else{ ?>
-
-          <div class="form-group">
-            <label>Client</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-              </div>
-              <select class="form-control select2" name="client">
-                <option value="">- Client -</option>
-                <?php 
-                
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
-                while($row = mysqli_fetch_array($sql)){
-                  $client_id = $row['client_id'];
-                  $client_name = htmlentities($row['client_name']);
-                  $contact_email = htmlentities($row['contact_email']);
-                ?>
-                  <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
           </div>
-            
-          <?php } ?>
-
-          <?php if(!empty($config_smtp_host)){ ?>
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
-          </div>
-          <?php } ?>
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_event" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index b93031e8..92acfe50 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -13,126 +13,146 @@
         
         <div class="modal-body bg-white">
 
-          <div class="form-group">
-            <label>Title <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
-            </div>
-          </div>
+          <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+              <a class="nav-link active" data-toggle="pill" href="#pills-event<?php echo $event_id; ?>"><i class="fa fa-fw fa-calendar"></i> Event</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-more<?php echo $event_id; ?>"><i class="fa fa-fw fa-info-circle"></i> More</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-attendees<?php echo $event_id; ?>"><i class="fa fa-fw fa-users"></i> Attendees</a>
+            </li>
+          </ul>
 
-          <div class="form-group">
-            <label>Description</label>
-            <textarea class="form-control" rows="3" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
-          </div>
+          <hr>
           
-          <div class="form-group">
-            <label>Calendar <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+          <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-event<?php echo $event_id; ?>">
+
+              <div class="form-group">
+                <label>Title <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
+                </div>
               </div>
-              <select class="form-control select2" name="calendar" required>
-                <?php 
-                
-                $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC"); 
-                while($row = mysqli_fetch_array($sql_calendars_select)){
-                  $calendar_id_select = $row['calendar_id'];
-                  $calendar_name_select = htmlentities($row['calendar_name']);
-                  $calendar_color_select = htmlentities($row['calendar_color']);
-                ?>
-                  <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if($calendar_id == $calendar_id_select){ echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Start <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+              
+              <div class="form-group">
+                <label>Calendar <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+                  </div>
+                  <select class="form-control select2" name="calendar" required>
+                    <?php 
+                    
+                    $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_calendars_select)){
+                      $calendar_id_select = $row['calendar_id'];
+                      $calendar_name_select = htmlentities($row['calendar_name']);
+                      $calendar_color_select = htmlentities($row['calendar_color']);
+                    ?>
+                      <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color_select; ?>;'></i> <?php echo $calendar_name_select; ?>"<?php if($calendar_id == $calendar_id_select){ echo "selected"; } ?> value="<?php echo $calendar_id_select; ?>"><?php echo $calendar_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
               </div>
-              <input type="datetime-local" class="form-control" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>End <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-stopwatch"></i></span>
+              
+              <label>Start / End <strong class="text-danger">*</strong></label>
+              <div class="form-row">
+                <div class="col-md-6 mb-3">
+                  <input type="datetime-local" class="form-control form-control-sm" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
+                </div>
+                <div class="col-md-6 mb-3">
+                  <input type="datetime-local" class="form-control form-control-sm" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>"required>
+                </div>
               </div>
-              <input type="datetime-local" class="form-control" name="end" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_end)); ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Repeat</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
+
+              <div class="form-group">
+                <label>Description</label>
+                <textarea class="form-control" rows="4" name="description" placeholder="Enter a description"><?php echo $event_description; ?></textarea>
               </div>
-              <select class="form-control select2" name="repeat">
-                <option <?php if(empty($event_repeat)){ echo "selected"; } ?> value="">Never</option>
-                <option <?php if($event_repeat == "Day"){ echo "selected"; } ?>>Day</option>
-                <option <?php if($event_repeat == "Week"){ echo "selected"; } ?>>Week</option>
-                <option <?php if($event_repeat == "Month"){ echo "selected"; } ?>>Month</option>
-                <option <?php if($event_repeat == "Year"){ echo "selected"; } ?>>Year</option>
-              </select>
+
             </div>
-          </div>
 
-          <?php if(isset($client_id)){ ?>
-
-          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-
-          <?php }else{ ?>
-
-          <div class="form-group">
-            <label>Client</label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+            <div class="tab-pane fade" id="pills-more<?php echo $event_id; ?>">
+            
+              <div class="form-group">
+                <label>Repeat</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-recycle"></i></span>
+                  </div>
+                  <select class="form-control select2" name="repeat">
+                    <option <?php if(empty($event_repeat)){ echo "selected"; } ?> value="">Never</option>
+                    <option <?php if($event_repeat == "Day"){ echo "selected"; } ?>>Day</option>
+                    <option <?php if($event_repeat == "Week"){ echo "selected"; } ?>>Week</option>
+                    <option <?php if($event_repeat == "Month"){ echo "selected"; } ?>>Month</option>
+                    <option <?php if($event_repeat == "Year"){ echo "selected"; } ?>>Year</option>
+                  </select>
+                </div>
               </div>
-              <select class="form-control select2" name="client">
-                <option value="">- Client -</option>
-                <?php 
-                
-                $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
-                while($row = mysqli_fetch_array($sql_clients)){
-                  $client_id_select = $row['client_id'];
-                  $client_name_select = htmlentities($row['client_name']);
-                  $contact_email_select = htmlentities($row['contact_email']);
-                ?>
-                  <option <?php if($client_id == $client_id_select){ echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                
-                <?php
-                }
-                ?>
-              </select>
+
             </div>
-          </div>
 
-          <?php } ?>
+            <div class="tab-pane fade" id="pills-attendees<?php echo $event_id; ?>">
+
+              <?php if(isset($_GET['client_id'])){ ?>
+
+              <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+
+              <?php }else{ ?>
+
+              <div class="form-group">
+                <label>Client</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                  </div>
+                  <select class="form-control select2" name="client">
+                    <option value="">- Client -</option>
+                    <?php 
+                    
+                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_clients)){
+                      $client_id_select = $row['client_id'];
+                      $client_name_select = htmlentities($row['client_name']);
+                      $contact_email_select = htmlentities($row['contact_email']);
+                    ?>
+                      <option <?php if($client_id == $client_id_select){ echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
+              <?php } ?>
+
+              <?php if(!empty($config_smtp_host)){ ?>
+              <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
+                <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
+              </div>
+              <?php } ?>
+
+            </div>
 
-          <?php if(!empty($config_smtp_host)){ ?>
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizing<?php echo $event_id; ?>" name="email_event" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing<?php echo $event_id; ?>">Email Event</label>
           </div>
-          <?php } ?>
 
         </div>
         <div class="modal-footer bg-white">
-          <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-danger mr-auto"><i class="fa fa-trash text-white"></i></a>
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_event" class="btn btn-primary">Save</button>
+          <a href="post.php?delete_event=<?php echo $event_id; ?>" class="btn btn-danger mr-auto"><i class="fa fa-trash"></i> Delete</a>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_event" class="btn btn-primary"><strong><i class="fa fa-check"></i> Update</button>
         </div>
       </form>
     </div>
diff --git a/clients.php b/clients.php
index b62b2f50..17bb6c0c 100644
--- a/clients.php
+++ b/clients.php
@@ -202,7 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $client_net_terms = htmlentities($row['client_net_terms']);
             $client_referral = htmlentities($row['client_referral']);
             $client_notes = htmlentities($row['client_notes']);
-            $client_created_at = $row['client_created_at'];
+            $client_created_at = date('Y-m-d',strtotime($row['client_created_at']));
             $client_updated_at = $row['client_updated_at'];
             $client_archive_at = $row['client_archived_at'];
 
@@ -266,7 +266,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               <?php echo $client_tags_display; ?>
               <?php } ?>
               <br>
-              <small class="text-secondary"><b>Added:</b> <?php echo $client_created_at; ?></small>
+              <small class="text-secondary"><strong>Created:</strong> <?php echo $client_created_at; ?></small>
             </td>
             <td><?php echo $location_address_display; ?></td>
             <td>
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index 94da504c..6f9663a3 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -9,6 +9,37 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
+          
+          <div class="form-group">
+            <label>Subject <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+              </div>
+              <input type="text" class="form-control" name="subject" placeholder="Subject" required>
+            </div>
+          </div>
+
+
+          
+          <div class="form-group">
+            <textarea class="form-control summernote" rows="8" name="details"></textarea>
+          </div>
+
+          <div class="form-group">
+            <label>Priority <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+              </div>
+              <select class="form-control select2" name="priority" required>
+                <option>Low</option>
+                <option>Medium</option>
+                <option>High</option>
+              </select>
+            </div>
+          </div>
+
           <?php if(isset($_GET['client_id'])){ ?>
             <input type="hidden" name="client" value="<?php echo $client_id; ?>">
             <div class="form-group">
@@ -60,11 +91,37 @@
           </div>
           <?php } ?>
 
+          <?php if(isset($_GET['client_id'])){ ?>
+            <div class="form-group">
+              <label>Asset</label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                </div>
+                <select class="form-control select2" name="asset">
+                  <option value="0">- None -</option>
+                  <?php
+
+                  $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
+                  while($row = mysqli_fetch_array($sql_assets)){
+                    $asset_id_select = $row['asset_id'];
+                    $asset_name_select = htmlentities($row['asset_name']);
+                    ?>
+                    <option <?php if(!empty($asset_id) && $asset_id == $asset_id_select){ echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+
+                  <?php
+                  }
+                  ?>
+                </select>
+              </div>
+            </div>
+          <?php } ?>
+
           <div class="form-group">
-            <label>Assigned to</label>
+            <label>Assign to</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
               </div>
               <select class="form-control select2" name="assigned_to">
                 <option value="0">Not Assigned</option>
@@ -72,81 +129,28 @@
                 
                 //$sql = mysqli_query($mysqli,"SELECT * FROM users, user_companies WHERE users.user_id = user_companies.user_id AND user_archived_at IS NULL AND user_companies.company_id = $session_company_id ORDER BY user_name ASC");
                 $sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
-                                                    LEFT JOIN user_companies ON users.user_id = user_companies.user_id
-                                                    LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                                    WHERE user_companies.company_id = $session_company_id 
-                                                    AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
+                  LEFT JOIN user_companies ON users.user_id = user_companies.user_id
+                  LEFT JOIN user_settings on users.user_id = user_settings.user_id
+                  WHERE user_companies.company_id = $session_company_id 
+                  AND user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                );
                 while($row = mysqli_fetch_array($sql)){
                   $user_id = $row['user_id'];
                   $user_name = htmlentities($row['user_name']);
                 ?>
-                <option value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                <option <?php if($session_user_id == $user_id){ echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
                 
                 <?php
                 }
                 ?>
               </select>
             </div>
-          </div>
-
-          <div class="form-group">
-            <label>Priority <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-              </div>
-              <select class="form-control select2" name="priority" required>
-                <option>Low</option>
-                <option>Medium</option>
-                <option>High</option>
-              </select>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Subject <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="subject" placeholder="Subject" required>
-            </div>
-          </div>
-
-          <?php if(isset($_GET['client_id'])){ ?>
-            <div class="form-group">
-                <label>Asset</label>
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-                    </div>
-                    <select class="form-control select2" name="asset">
-                        <option value="0">- None -</option>
-                        <?php
-
-                        $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
-                        while($row = mysqli_fetch_array($sql_assets)){
-                            $asset_id_select = $row['asset_id'];
-                            $asset_name_select = htmlentities($row['asset_name']);
-                            ?>
-                            <option <?php if(!empty($asset_id) && $asset_id == $asset_id_select){ echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-
-                            <?php
-                        }
-                        ?>
-                    </select>
-                </div>
-            </div>
-          <?php } ?>
-          
-          <div class="form-group">
-            <textarea class="form-control summernote" rows="8" name="details"></textarea>
-          </div>
+          </div>    
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_ticket" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_ticket" class="btn btn-primary"><strong><i class="fa fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/tickets.php b/tickets.php
index a1a688fb..2e47a4ac 100644
--- a/tickets.php
+++ b/tickets.php
@@ -362,22 +362,20 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
                         $contact_phone = formatPhoneNumber($row['contact_phone']);
                         $contact_extension = htmlentities($row['contact_extension']);
                         $contact_mobile = formatPhoneNumber($row['contact_mobile']);
-                        if ($ticket_status == "Open") {
-                            $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
-                        } elseif ($ticket_status == "Working") {
-                            $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
-                        } else {
-                            $ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>";
+                        if($ticket_status == "Open"){
+                            $ticket_status_color = "primary";
+                        }elseif($ticket_status == "Working") {
+                            $ticket_status_display = "success";
+                        }else{
+                            $ticket_status_display = "secondary";
                         }
 
-                        if ($ticket_priority == "High") {
-                            $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
-                        } elseif ($ticket_priority == "Medium") {
-                            $ticket_priority_display = "<span class='p-2 badge badge-warning'>$ticket_priority</span>";
-                        } elseif ($ticket_priority == "Low") {
-                            $ticket_priority_display = "<span class='p-2 badge badge-info'>$ticket_priority</span>";
-                        } else {
-                            $ticket_priority_display = "-";
+                        if($ticket_priority == "High"){
+                            $ticket_priority_color = "danger";
+                        }elseif($ticket_priority == "Medium"){
+                            $ticket_priority_color = "warning";
+                        }else{
+                            $ticket_priority_color = "info";
                         }
                         $ticket_assigned_to = $row['ticket_assigned_to'];
                         if (empty($ticket_assigned_to)) {
@@ -413,8 +411,8 @@ $user_active_assigned_tickets = $row['total_tickets_assigned'];
                                 <br>
                                 <?php echo $contact_display; ?>
                             </td>
-                            <td><?php echo $ticket_priority_display; ?></td>
-                            <td><?php echo $ticket_status_display; ?></td>
+                            <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></td>
+                            <td><span class='p-2 badge badge-pill badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status; ?></span></td>
                             <td><?php echo $ticket_assigned_to_display; ?></td>
                             <td><?php echo $ticket_updated_at_display; ?></td>
                             <td><?php echo $ticket_created_at; ?></td>