diff --git a/admin/templates/states_panel.html b/admin/templates/states_panel.html
index 705d470..430aae6 100644
--- a/admin/templates/states_panel.html
+++ b/admin/templates/states_panel.html
@@ -8,7 +8,6 @@
   </div>
   <div class="col text-end">
     <button type="button" class="btn btn-green-admin" data-bs-toggle="modal" data-bs-target="#addStateModal">
-      <i class="fas fa-plus text-secondary align-center p-1"></i>
       {% trans "Add" %}
     </button>
   </div>
@@ -23,11 +22,9 @@
     </caption>
   <thead class="table-light">
     <tr>
-      <th scope="col" width="1%">
+      <th scope="col" width="5%" class="text-start">
       </th>
-      <th scope="col" width="7%" class="text-center">#
-      </th>
-      <th scope="col" class="">{% trans "State Definition" %}
+      <th scope="col">{% trans "State Definition" %}
       </th>
       <th scope="col" width="15%" class="text-center">{% trans "Actions" %}
       </th>
@@ -41,42 +38,32 @@
         class="align-items-center">
 
         <td class="text-center">
-          <i class="bi bi-grip-vertical text-muted" aria-hidden="true">
+          <i class="fas fa-light fa-grip" aria-hidden="true">
           </i>
+          <strong class="ps-2">{{ state_definition.order }} </strong>
         </td>
-        <td class="fw-bold text-center">
-          {{ state_definition.order }}
-        </td>
-        <td>
+        <td class="font-monospace">
           {{ state_definition.state }}
         </td>
 
         <!-- action buttons -->
-        <td class="text-center">
-          <div class="d-flex justify-content-center gap-1">
-            <button
-              type="button"
-              class="btn btn-sm btn-info"
-              data-bs-toggle="modal"
-              data-bs-target="#editStateModal{{ state_definition.id }}">
+        <td>
+          <div class="btn-group float-end">
+            <button type="button" class="btn btn-sm btn-info text-white" data-bs-toggle="modal" data-bs-target="#editStateModal{{ state_definition.id }}">
               <i class="bi bi-pencil">
-              </i>
+              </i> {% trans 'Edit' %}
             </button>
-            <button
-              type="button"
-              id="delete-btn"
-              class="btn btn-sm btn-danger"
-              data-bs-toggle="modal"
-              data-bs-target="#deleteStateModal{{ state_definition.id }}">
+            <button type="button" class="btn btn-sm btn-danger" data-bs-toggle="modal" data-bs-target="#deleteStateModal{{ state_definition.id }}">
               <i class="bi bi-trash">
               </i>
             </button>
           </div>
+
         </td>
       </tr>
     {% endfor %}
   </tbody>
-</table>
+  </table>
 
   <form id="orderingForm" method="post" action="{% url 'admin:update_state_order' %}">
         {% csrf_token %}
@@ -148,7 +135,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
-          <button type="submit" class="btn btn-primary">{% trans "Save Changes" %}</button>
+          <button type="submit" class="btn btn-green-admin">{% trans "Save Changes" %}</button>
         </div>
       </form>
     </div>
diff --git a/admin/views.py b/admin/views.py
index df36e9e..105dc69 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -19,7 +19,6 @@ from user.models import User, Institution
 from admin.email import NotifyActivateUserByEmail
 from action.models import StateDefinition
 
-device_logger = logging.getLogger('device_log')
 
 class AdminView(DashboardView):
     def get(self, *args, **kwargs):
@@ -164,7 +163,6 @@ class AddStateDefinitionView(AdminView, StateDefinitionContextMixin, CreateView)
         try:
             response = super().form_valid(form)
             messages.success(self.request, _("State definition successfully added."))
-            device_logger.info(f"<Created> StateDefinition with value {form.instance.state} by user {self.request.user}.")
             return response
         except IntegrityError:
             messages.error(self.request, _("State is already defined."))