diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
index 309df5eede..ae5f9f7e41 100644
--- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
+++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php
@@ -128,8 +128,7 @@ class="autosave-field"
                     </div>
                     <div style="padding-top:6px;">
                         <?php if ($login::userIsAtLeast($roles::$editor)) {  ?>
-                           <a href="javascript:void(0);" onclick="jQuery('#editorId').val(<?php echo session('userdata.id'); ?>).trigger('chosen:updated');"><?php echo $tpl->__('label.assign_to_me'); ?></a>
-                        <?php } ?>
+                        <a href="javascript:void(0);" onclick="assignToMe();"><?php echo $tpl->__('label.assign_to_me'); ?></a>                        <?php } ?>
                     </div>
                 </div>
 
@@ -219,6 +218,46 @@ function loadStatusHistory(ticketId) {
             }
         });
     }
+window.assignToMe = function() {
+    const userId = <?php echo session('userdata.id'); ?>;
+    const $editorSelect = $('#editorId');
+    const currentEditorId = $editorSelect.val();
+    
+    if (currentEditorId == userId) {
+        return; 
+    }
+    
+    const ticketId = $('#status-change-log').data('ticket-id');
+    const user = $('#status-select').data('user') || 'Unknown User';
+    
+    const oldStatusText = $editorSelect.data('old-status');
+    const newStatusText = '<?php echo addslashes($currentUserName); ?>';
+    
+    $editorSelect.val(userId).trigger('chosen:updated');
+    $editorSelect.data('old-status', newStatusText);
+    
+    $.ajax({
+        url: '<?= BASE_URL ?>/tickets/ticketHistoryController/logStatusChange',
+        method: 'POST',
+        data: {
+            ticketId: ticketId,
+            oldStatus: currentEditorId,
+            newStatus: userId,
+            oldStatusText: oldStatusText,
+            newStatusText: newStatusText,
+            user: user,
+            detailsAttributeId: 'editorId'
+        },
+        success: function(response) {
+            $('.saveTicketBtn').trigger('click');
+            loadStatusHistory(ticketId);
+        },
+        error: function(xhr, status, error) {
+            console.error('Error saving status:', error);
+            console.error('Response:', xhr.responseText);
+        }
+    });
+};
 
     const ticketIdOnLoad = $('#status-change-log').data('ticket-id');
     if (ticketIdOnLoad) {
@@ -278,7 +317,7 @@ function loadStatusHistory(ticketId) {
         const user = $(this).data('user') || 'Unknown User';
 
         $.ajax({
-            url: '/tickets/ticketHistoryController/logStatusChange',
+            url: '<?= BASE_URL ?>/tickets/ticketHistoryController/logStatusChange',
             method: 'POST',
             data: {
                 ticketId: ticketId,
@@ -290,7 +329,6 @@ function loadStatusHistory(ticketId) {
                 detailsAttributeId: changedElementId
             },
             success: function(response) {
-                console.log('Status change saved', response);
                 loadStatusHistory(ticketId);
             },
             error: function(xhr, status, error) {
@@ -309,7 +347,6 @@ function loadStatusHistory(ticketId) {
         const oldStatusText = $(this).data('old-status');
         const newStatusText = $(this).val();
         const user = $(this).data('user') || 'Unknown User';
-        console.log('Date: ', oldStatusText, newStatusText);
 
         $.ajax({
             url: '<?= BASE_URL ?>/tickets/ticketHistoryController/logStatusChange',
@@ -324,7 +361,6 @@ function loadStatusHistory(ticketId) {
                 detailsAttributeId: changedElementId
             },
             success: function(response) {
-                console.log('Status change saved', response);
                 loadStatusHistory(ticketId);
             },
             error: function(xhr, status, error) {
diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php
index eeed1deaec..14aae45568 100644
--- a/app/Domain/Timesheets/Templates/showMy.tpl.php
+++ b/app/Domain/Timesheets/Templates/showMy.tpl.php
@@ -275,7 +275,7 @@
                 </div>
 
             </div>
-                <div style=" width: 100%;">
+                <div style=" width: 100%; overflow-x:scroll;">
             <table cellpadding="0" width="100%" class="table table-bordered display timesheetTable" id="dyntableX" data-hours-format="<?= $tpl->escape($hoursFormat); ?>">
                 <colgroup>
                       <col class="con0" >
@@ -422,8 +422,10 @@ class="hourCell"
                         <?php } ?>
 
                         <!-- Row to add new time registration -->
-                        <tr class="gradeA timesheetRow" style="z-index: 9999;" >
-                            <td width="14%" style="z-index: 9999;" >
+                        <tr class="gradeA timesheetRow">
+                            <td width="5%">-</td>
+                            <td width="5%">-</td>
+                            <td width="12%">
                                 <div class="form-group" id="projectSelect">
                                     <select data-placeholder="<?php echo $tpl->__('input.placeholders.choose_project')?>" class="project-select">
                                         <option value=""></option>
@@ -474,7 +476,7 @@ class="hourCell"
                                 </div>
                             </td>
                             <td width="8%">
-                                <select class="kind-select" name="kindId">
+                                <select class="kind-select" name="kindId" style="width:150px;">
                                         <?php foreach ($tpl->get('kind') as $key => $kindRow) { ?>
                                             <?php echo '<option value='.$key.'>'.$tpl->__($kindRow).'</option>'; ?>
                                         <?php }?>
diff --git a/package-lock.json b/package-lock.json
index a0ad2b27a1..af1f8d6e2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,6 @@
         "datatables.net-buttons": "^2.4.2",
         "datatables.net-rowgroup": "^1.4.1",
         "datatables.net-rowreorder": "^1.4.1",
-        "flatpickr": "^4.6.13",
         "fullcalendar": "^6.1.11",
         "gridstack": "^12.1.1",
         "htmx.org": "^1.9.12",
@@ -7746,12 +7745,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/flatpickr": {
-      "version": "4.6.13",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-      "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==",
-      "license": "MIT"
-    },
     "node_modules/flatted": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",