diff --git a/agent/ticket.php b/agent/ticket.php
index 44b09c82..30fdcd01 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -439,13 +439,13 @@ if (isset($_GET['ticket_id'])) {
             <div class="card card-body">
 
                 <div title="<?php echo $ticket_updated_at; ?>">
-                    <i class="fa fa-fw fa-history text-secondary mr-2"></i>Last updated: <strong><?= date('M d, Y • g:i A', strtotime($ticket_updated_at)) . "</strong> <span class='text-muted small'>($ticket_updated_at_ago)</span>" ?>
+                    <i class="fa fa-fw fa-history text-secondary mr-2"></i>Updated: <strong><?= date('M d, Y • g:i A', strtotime($ticket_updated_at)) . "</strong> <span class='text-muted small'>($ticket_updated_at_ago)</span>" ?>
                 </div>
 
                 <!-- Ticket assign (disable if closed -->
                 <?php if (empty($ticket_closed_at)) { ?>
                     <div class="mt-1">
-                        <i class="fas fa-fw fa-user-tie mr-2 text-secondary"></i>Assigned Agent:
+                        <i class="fas fa-fw fa-user-tie mr-2 text-secondary"></i>Agent:
                         <a class="ajax-modal" href="#"
                             data-modal-url="modals/ticket/ticket_assign.php?id=<?= $ticket_id ?>">
                             <?= $ticket_assigned_to_display ?>
@@ -453,7 +453,7 @@ if (isset($_GET['ticket_id'])) {
                     </div>
                 <?php } else { ?>
                     <div class="mt-1">
-                        <i class="fas fa-fw fa-user-check mr-2 text-secondary"></i>Assigned Agent: <?php echo $ticket_assigned_to_display; ?>
+                        <i class="fas fa-fw fa-user-check mr-2 text-secondary"></i>Agent: <?php echo $ticket_assigned_to_display; ?>
                     </div>
                 <?php } ?>
                 <!-- End ticket assign -->
@@ -565,9 +565,9 @@ if (isset($_GET['ticket_id'])) {
                             <input type="hidden" name="ticket_id" id="ticket_id" value="<?php echo $ticket_id; ?>">
                             <input type="hidden" name="client_id" id="client_id" value="<?php echo $client_id; ?>">
 
-                            <div class="card card-body d-print-none pb-0">
+                            <div class="card card-body d-print-none p-3">
 
-                                <div class="form-group">
+                                <div class="form-group mb-0">
                                     <div class="btn-group btn-block btn-group-toggle" data-toggle="buttons">
                                         <label class="btn btn-outline-dark active">
                                             <input type="radio" name="public_reply_type" value="0" checked>Internal
@@ -585,19 +585,17 @@ if (isset($_GET['ticket_id'])) {
 
                             </div>
 
-                            <div class="form-group mb-0">
+                            <div class="form-group">
                                 <textarea
                                     class="form-control tinymceTicket" name="ticket_reply"
                                     placeholder="Type a response">
                                 </textarea>
                             </div>
 
-
-                            <div class="card card-body pb-0">
-
-                                <div class="form-row">
-                                    <div class="col-md-3">
-                                        <div class="input-group mb-3">
+                            <div class="form-row">
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <div class="input-group">
                                             <select class="form-control select2" name="status" required>
 
                                                 <!-- Show all active ticket statuses, apart from new or closed as these are system-managed -->
@@ -617,10 +615,12 @@ if (isset($_GET['ticket_id'])) {
                                             </select>
                                         </div>
                                     </div>
+                                </div>
 
-                                    <!-- Time Tracking -->
-                                    <div class="col-md-6">
-                                        <div class="input-group mb-3">
+                                <!-- Time Tracking -->
+                                <div class="col-md-6">
+                                    <div class="form-group">
+                                        <div class="input-group">
                                             <div class="input-group-prepend px-0 col-2">
                                                 <input type="text" class="form-control" inputmode="numeric" id="hours" name="hours" placeholder="Hrs" min="0" max="23" pattern="0?[0-9]|1[0-9]|2[0-3]">
                                             </div>
@@ -639,14 +639,14 @@ if (isset($_GET['ticket_id'])) {
                                             </div>
                                         </div>
                                     </div>
-
-                                    <div class="col-md-3">
-                                        <div class="btn-toolbar float-right">
-                                            <button type="submit" id="ticket_add_reply" name="add_ticket_reply" class="btn btn-success ml-3"><i class="fas fa-check mr-2"></i>Submit</button>
-                                        </div>
-                                    </div>
-
                                 </div>
+
+                                <div class="col-md-3">
+                                    <div class="btn-toolbar float-right mb-3">
+                                        <button type="submit" id="ticket_add_reply" name="add_ticket_reply" class="btn btn-success ml-3"><i class="fas fa-check mr-2"></i>Submit</button>
+                                    </div>
+                                </div>
+
                             </div>
 
                         </form>
diff --git a/agent/ticket_list.php b/agent/ticket_list.php
index caf022b0..38f43d60 100644
--- a/agent/ticket_list.php
+++ b/agent/ticket_list.php
@@ -125,9 +125,9 @@
                             $ticket_assigned_to = intval($row['ticket_assigned_to']);
                             if (empty($ticket_assigned_to)) {
                                 if (!empty($ticket_closed_at)) {
-                                    $ticket_assigned_to_display = "<p>Not Assigned</p>";
+                                    $ticket_assigned_to_display = "<p>Unassigned</p>";
                                 } else {
-                                    $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
+                                    $ticket_assigned_to_display = "<p class='text-muted'>Unassigned</p>";
                                 }
                             } else {
                                 $ticket_assigned_to_display = nullable_htmlentities($row['user_name']);
@@ -203,7 +203,7 @@
                                 <!-- Ticket Number -->
                                 <td>
                                     <a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>">
-                                        <span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span>
+                                        <span class="badge badge-pill badge-dark p-2"><?php echo "$ticket_prefix$ticket_number"; ?></span>
                                     </a>
                                 </td>
 
@@ -212,12 +212,12 @@
                                     <a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>"><?= $ticket_subject ?></a>
 
                                     <?php if($task_count && $completed_task_count > 0) { ?>
-                                    <div class="progress mt-2" style="height: 20px;">
+                                    <div class="progress mt-1" style="height: 15px;">
                                         <div class="progress-bar" style="width: <?php echo $tasks_completed_percent; ?>%;"><?php echo $completed_task_count.' / '.$task_count; ?></div>
                                     </div>
                                     <?php } ?>
                                     <?php if($task_count && $completed_task_count == 0) { ?>
-                                    <div class="mt-2" style="height: 20px; background-color:#e9ecef;">
+                                    <div class="mt-1" style="height: 15px; background-color:#e9ecef;">
                                         <p class="text-center" ><?php echo $completed_task_count.' / '.$task_count; ?></p>
                                     </div>
                                     <?php } ?>
diff --git a/agent/tickets.php b/agent/tickets.php
index da70cae0..9de95b8f 100644
--- a/agent/tickets.php
+++ b/agent/tickets.php
@@ -214,26 +214,20 @@ $sql_categories_filter = mysqli_query(
 
                     <div class="col-sm-3">
                         <div class="form-group">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text bg-light"><i class="fas fa-layer-group"></i></span>
-                                </div>
-                                <select class="form-control select2" name="category" onchange="this.form.submit()">
-                                    <option value="">- All Categories -</option>
+                            <select class="form-control select2" name="category" onchange="this.form.submit()">
+                                <option value="">- All Categories -</option>
 
-                                    <?php
-                                    while ($row = mysqli_fetch_assoc($sql_categories_filter)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
-                                    ?>
-                                        <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                                    <?php
-                                    }
-                                    ?>
+                                <?php
+                                while ($row = mysqli_fetch_assoc($sql_categories_filter)) {
+                                    $category_id = intval($row['category_id']);
+                                    $category_name = nullable_htmlentities($row['category_name']);
+                                ?>
+                                    <option <?php if ($category_filter == $category_id) { echo "selected"; } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                                <?php
+                                }
+                                ?>
 
-                                </select>
-
-                            </div>
+                            </select>
                         </div>
                     </div>
                     <div class="col-sm-5">
diff --git a/includes/load_global_settings.php b/includes/load_global_settings.php
index cd368476..25b8208f 100644
--- a/includes/load_global_settings.php
+++ b/includes/load_global_settings.php
@@ -117,8 +117,8 @@ $config_log_retention = intval($row['config_log_retention']);
 // Locale
 $config_currency_format = "US_en";
 $config_timezone = $row['config_timezone'];
-$config_date_format = "Y-m-d";
-$config_time_format = "H:i";
+$config_date_format = "M d, Y";
+$config_time_format = "g:i A";
 
 // Theme
 $config_theme = $row['config_theme'];