diff --git a/action/views.py b/action/views.py
index 848b850..3c70e4d 100644
--- a/action/views.py
+++ b/action/views.py
@@ -45,17 +45,10 @@ class ActionUndoView(DeleteView):
 
     def delete(self, request, *args, **kwargs):
         self.object = self.get_object()
-        time_since_creation = timezone.now() - self.object.date
-        if time_since_creation.total_seconds() <= 3600:  # 1 hour = 3600 seconds
-            data_to_return= super().delete(request, *args, **kwarg)
-
-            messages.success(request, f"Action to state'{self.object.state}' has been delete.")
-            return data_to_return
-        else:
-            #TODO: revise if condition is correct
-            messages.error(request, "You can undo an action within one hour of its creation.")
-            return reverse_lazy(self.get_success_url())
+        return super().delete(request, *args, **kwarg)
 
     def get_success_url(self):
+
+        messages.info(self.request, f"Action to state: {self.object.state} has been deleted.")
         device_logger.info(f"<Deleted> State '{self.object.state}', for device '{self.object.snapshot_uuid}') by user {self.request.user}.")
         return self.request.META.get('HTTP_REFERER', reverse_lazy('device:details', args=[self.object.snapshot_uuid]))
diff --git a/device/templates/tabs/general_details.html b/device/templates/tabs/general_details.html
index a38da58..9c1d7e5 100644
--- a/device/templates/tabs/general_details.html
+++ b/device/templates/tabs/general_details.html
@@ -90,7 +90,7 @@
               </th>
               <th scope="col">{% trans 'User' %}
               </th>
-              <th scope="col">{% trans 'Date' %}
+              <th scope="col">{% trans 'Since' %}
               </th>
             </tr>
           </thead>
@@ -101,15 +101,14 @@
               </td>
               <td>{{ device_states.0.user.responsable_person|default:device_states.0.user.username }}
               </td>
-              <td>{{ device_states.0.date|date:"M j, Y, H:i" }}
+              <td>{{ device_states.0.date|timesince }}
               </td>
-              {% if device_states.0.date|timesince < '1 hour' %}
-              <td>
-                 <a href="#" data-bs-toggle="modal" data-bs-target="#deleteStateModal{{ device_states.0.id }}" title="{% trans 'Undo' %}">
-                  <i class="bi bi-trash text-danger"></i>
+              <td class="text-end">
+                 <a href="#" data-bs-toggle="modal" class="text-danger" data-bs-target="#deleteStateModal{{ device_states.0.id }}" title="{% trans 'Undo' %}">
+                     {%  trans 'undo' %}
+                     <i class="fas fa-undo ps-1"></i>
                 </a>
               </td>
-              {% endif %}
             </tr>
             {% else %}
             <tr>