diff --git a/css/ticket_time_tracking.css b/css/ticket_time_tracking.css
deleted file mode 100644
index eb2c2c5c..00000000
--- a/css/ticket_time_tracking.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Custom CSS Styling for time tracking */
-
-/* Small bit of space between the ticket status and time tracking inputs */
-.custom-tt-horizontal-spacing {
-    width: 20px; /* Adjust the width as needed for smaller spacing */
-    display: inline-block;
-}
-
-/* Adjust Hour, min, and second fields to be close together */
-.custom-tt-width {
-    width: 50px; /* Adjust the width as needed */
-    padding: 0;  /* Remove padding to maintain the desired width */
-}
diff --git a/ticket.php b/ticket.php
index c987befd..bd89a7d0 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,13 +1,6 @@
 <?php
 require_once "inc_all.php";
 
-?>
-
-<!-- Custom styling of time tracking elements -->
-<link rel="stylesheet" type="text/css" href="css/ticket_time_tracking.css">
-
-<?php
-
 // Initialize the HTML Purifier to prevent XSS
 require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
@@ -552,27 +545,22 @@ if (isset($_GET['ticket_id'])) {
                                     <input type="radio" name="public_reply_type" value="0">Internal Note
                                 </label>
                             </div>
+                            <?php if ($config_ai_enable) { ?>
+                                <div class="float-right">
+                                    <button id="rewordButton" class="btn btn-secondary" type="button"><i class="fas fa-fw fa-robot mr-2"></i>AI Reword</button>
+                                    <button id="undoButton" class="btn btn-secondary" type="button" style="display:none;"><i class="fas fa-fw fa-redo-alt mr-2"></i>Undo</button>
+                                </div>
+                            <?php } ?>
                         </div>
+
+                        
                         
                         <div class="form-group">
-                            <?php if ($config_ai_enable) { ?>
-                            <div class="form-group">
-                                <textarea class="form-control tinymceai" id="textInput" name="ticket_reply" placeholder="Type a response"></textarea>
-                            </div>
-
-                            <div class="mb-3">
-                                <button id="rewordButton" class="btn btn-secondary" type="button"><i class="fas fa-fw fa-robot mr-2"></i>AI Reword</button>
-                                <button id="undoButton" class="btn btn-secondary" type="button" style="display:none;"><i class="fas fa-fw fa-redo-alt mr-2"></i>Undo</button>
-                            </div>
-                            <?php } else { ?>
-                            <div class="form-group">
-                                <textarea class="form-control tinymce" name="ticket_reply" placeholder="Type a response"></textarea>
-                            </div>
-                            <?php } ?>
-
+                            <textarea class="form-control tinymce<?php if ($config_ai_enable) { echo "ai"; } ?>" id="textInput" name="ticket_reply" placeholder="Type a response"></textarea>
                         </div>
+                        
                         <div class="form-row">
-                            <div class="col-md-2">
+                            <div class="col-md-4">
                                 <div class="input-group mb-3">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
@@ -592,40 +580,32 @@ if (isset($_GET['ticket_id'])) {
                                 </div>
                             </div>
 
-
-                            <div class="custom-tt-horizontal-spacing"></div> <!-- Add custom class for smaller spacing -->
-
                             <!-- Time Tracking -->
-                            <div class="col-sm-3 col-lg-2">
+                            <div class="col-md-6">
                                 <div class="input-group mb-3">
-                                    <div class="form-row">
-
-                                        <div class="input-group custom-tt-width">
-                                            <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>
-
-                                        <div class="input-group custom-tt-width">
-                                            <input type="text" class="form-control" inputmode="numeric" id="minutes" name="minutes" placeholder="Mins" min="0" max="59" pattern="[0-5]?[0-9]">
-                                        </div>
-
-                                        <div class="input-group custom-tt-width">
-                                            <input type="text" class="form-control" inputmode="numeric" id="seconds" name="seconds" placeholder="Secs" min="0" max="59" pattern="[0-5]?[0-9]">
-                                        </div>
-
+                                    <div class="input-group 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>
-                                </div>
-                            </div>
 
-                            <!-- Timer Controls -->
-                            <div class="col-sm-2">
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-success" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
-                                    <button type="button" class="btn btn-danger" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
+                                    <div class="input-group px-0 col-2">
+                                        <input type="text" class="form-control" inputmode="numeric" id="minutes" name="minutes" placeholder="Mins" min="0" max="59" pattern="[0-5]?[0-9]">
+                                    </div>
+
+                                    <div class="input-group px-0 col-2">
+                                        <input type="text" class="form-control" inputmode="numeric" id="seconds" name="seconds" placeholder="Secs" min="0" max="59" pattern="[0-5]?[0-9]">
+                                    </div>
+
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-success" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
+                                        <button type="button" class="btn btn-danger" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
+                                    </div>      
                                 </div>
                             </div>
 
                             <div class="col-md-2">
-                                <button type="submit" id="ticket_add_reply" name="add_ticket_reply" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Submit</button>
+                                <div class="float-right">
+                                    <button type="submit" id="ticket_add_reply" name="add_ticket_reply" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Submit</button>
+                                </div>
                             </div>
 
                         </div>