diff --git a/powerdnsadmin/templates/dashboard_domain.html b/powerdnsadmin/templates/dashboard_domain.html
index d9acdeb..53d1cfe 100644
--- a/powerdnsadmin/templates/dashboard_domain.html
+++ b/powerdnsadmin/templates/dashboard_domain.html
@@ -1,17 +1,23 @@
 {% macro name(domain) %}
-  <a href="{{ url_for('domain.domain', domain_name=domain.name) }}"><strong>{{ domain.name | pretty_domain_name }}</strong></a>
+    <a href="{{ url_for('domain.domain', domain_name=domain.name) }}"><strong>{{ domain.name | pretty_domain_name }}</strong></a>
 {% endmacro %}
 
 {% macro dnssec(domain) %}
-  {% if domain.dnssec %}
-  <td><span style="cursor:pointer" class="badge badge-success button_dnssec" id="{{ domain.name }}"><i class="fa-solid fa-lock"></i>&nbsp;Enabled</span></td>
-  {% else %}
-  <td><span style="cursor:pointer" class="badge badge-danger button_dnssec" id="{{ domain.name }}"><i class="fa-solid fa-lock-open"></i>&nbsp;Disabled</span></td>
-  {% endif %}
+    {% if domain.dnssec %}
+        <td>
+            <button class="btn badge btn-success button_dnssec" title="Edit DNSSEC" id="{{ domain.name }}"><i
+                    class="fa-solid fa-lock"></i></button>
+        </td>
+    {% else %}
+        <td>
+            <button class="btn badge btn-danger button_dnssec" title="Enable DNSSEC" id="{{ domain.name }}"><i
+                    class="fa-solid fa-lock-open"></i></button>
+        </td>
+    {% endif %}
 {% endmacro %}
 
 {% macro type(domain) %}
-  {{ domain.type | format_zone_type }}
+    {{ domain.type | format_zone_type }}
 {% endmacro %}
 
 {% macro serial(domain) %}
@@ -19,61 +25,53 @@
 {% endmacro %}
 
 {% macro master(domain) %}
-    {% if domain.master == '[]'%}N/A{% else %}{{ domain.master | display_master_name }}{% endif %}
+    {% if domain.master == '[]' %}N/A{% else %}{{ domain.master | display_master_name }}{% endif %}
 {% endmacro %}
 
 {% macro account(domain) %}
     {% if current_user.role.name in ['Administrator', 'Operator'] %}
-      {{ domain.account.name if domain.account else 'None' }}
+        {{ domain.account.name if domain.account else 'None' }}
     {% endif %}
 {% endmacro %}
 
 {% macro actions(domain) %}
-<td width="6%">
-  <div class="dropdown">
-    <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <i class="fa-solid fa-bars"></i>
-    </button>
-    <div class="dropdown-menu" aria-labelledby="dropdownMenu">
-      {% if current_user.role.name in ['Administrator', 'Operator'] %}
-        <button class="dropdown-item btn-success button_template" id="{{ domain.name }}" type="button">
-          <i class="fa-solid fa-clone"></i>&nbsp;Clone to Template
-        </button>
-        <button class="dropdown-item btn-success" type="button" onclick="window.location.href='{{ url_for('domain.domain', domain_name=domain.name) }}'">
-          <i class="fa-solid fa-cog"></i>&nbsp;Manage Domain
-        </button>
-        <button class="dropdown-item btn-danger" type="button" onclick="window.location.href='{{ url_for('domain.setting', domain_name=domain.name) }}'">
-          <i class="fa-solid fa-cog"></i>&nbsp;Admin Settings
-        </button>
-        <button class="dropdown-item btn-primary" type="button" onclick="window.location.href='{{ url_for('domain.changelog', domain_name=domain.name) }}'">
-          <i class="fa-solid fa-history" aria-hidden="true"></i>&nbsp;Domain Changelog
-        </button>
-        <div class="dropdown-divider"></div>
-        <button type="button"class="dropdown-item btn-secondary button_delete" onclick="window.location.href='{{ url_for('domain.remove') }}'">
-          <font color="red">
-            <i class="fa-solid fa-trash"></i>&nbsp;Remove Domain
-          </font>
-        </button>
-       </div>
-      {% else %}
-        <button class="dropdown-item btn-success" type="button" onclick="window.location.href='{{ url_for('domain.domain', domain_name=domain.name) }}'">
-          <i class="fa-solid fa-cog"></i>&nbsp;Manage Domain
-        </button>
-        {% if allow_user_view_history %}
-          <button class="dropdown-item btn-primary" type="button" onclick="window.location.href='{{ url_for('domain.changelog', domain_name=domain.name) }}'">
-            <i class="fa-solid fa-history" aria-hidden="true"></i>&nbsp;Domain Changelog
-          </button>
-        {% endif %}
-        {% if allow_user_remove_domain %}
-          <div class="dropdown-divider"></div>
-          <button type="button"class="dropdown-item btn-secondary button_delete" onclick="window.location.href='{{ url_for('domain.remove') }}'">
-            <font color="red">
-              <i class="fa-solid fa-trash"></i>&nbsp;Remove Domain
-            </font>
-          </button>
-        {% endif %}
-      {% endif %}  
-    </div>
-  </div>
-</td>
+    <td>
+        <div class="dropdown">
+            <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu" data-toggle="dropdown"
+                    aria-haspopup="true" aria-expanded="false">
+                <i class="fa-solid fa-bars"></i>
+            </button>
+            <div class="dropdown-menu" aria-labelledby="dropdownMenu">
+                <button class="dropdown-item btn-success" type="button"
+                        onclick="window.location.href='{{ url_for('domain.domain', domain_name=domain.name) }}'">
+                    <i class="fa-solid fa-pencil"></i>&nbsp;Edit Records
+                </button>
+
+                {% if current_user.role.name in ['Administrator', 'Operator'] %}
+                    <button class="dropdown-item btn-danger" type="button"
+                            onclick="window.location.href='{{ url_for('domain.setting', domain_name=domain.name) }}'">
+                        <i class="fa-solid fa-cog"></i>&nbsp;Zone Settings
+                    </button>
+                    <button class="dropdown-item btn-success button_template" id="{{ domain.name }}" type="button">
+                        <i class="fa-solid fa-clone"></i>&nbsp;Create Template
+                    </button>
+                {% endif %}
+
+                {% if current_user.role.name in ['Administrator', 'Operator'] or allow_user_view_history %}
+                    <button class="dropdown-item btn-primary" type="button"
+                            onclick="window.location.href='{{ url_for('domain.changelog', domain_name=domain.name) }}'">
+                        <i class="fa-solid fa-history" aria-hidden="true"></i>&nbsp;Zone Changelog
+                    </button>
+                {% endif %}
+
+                {% if current_user.role.name in ['Administrator', 'Operator'] or allow_user_remove_domain %}
+                    <div class="dropdown-divider"></div>
+                    <button type="button" class="dropdown-item btn-secondary button_delete"
+                            onclick="window.location.href='{{ url_for('domain.remove') }}'">
+                        <span style="color: red;"><i class="fa-solid fa-trash"></i>&nbsp;Remove Zone</span>
+                    </button>
+                {% endif %}
+            </div>
+        </div>
+    </td>
 {% endmacro %}