diff --git a/lib/modules/comments/web/settings.html.heex b/lib/modules/comments/web/settings.html.heex
index 42c81841..eaa9b062 100644
--- a/lib/modules/comments/web/settings.html.heex
+++ b/lib/modules/comments/web/settings.html.heex
@@ -8,14 +8,12 @@
   <div class="container flex flex-col mx-auto px-4 py-6">
     <%!-- Header --%>
     <header class="w-full mb-6">
-      <div class="mb-4">
-        <.link
-          navigate={PhoenixKit.Utils.Routes.path("/admin/settings")}
-          class="btn btn-outline btn-primary btn-sm"
-        >
-          <.icon name="hero-arrow-left" class="w-4 h-4" /> Back to Settings
-        </.link>
-      </div>
+      <.link
+        navigate={PhoenixKit.Utils.Routes.path("/admin/settings")}
+        class="btn btn-outline btn-primary btn-sm"
+      >
+        <.icon name="hero-arrow-left" class="w-4 h-4" /> Back to Settings
+      </.link>
 
       <div class="text-center">
         <h1 class="text-2xl sm:text-4xl font-bold">Comments Settings</h1>
diff --git a/lib/modules/maintenance/web/settings.html.heex b/lib/modules/maintenance/web/settings.html.heex
index 043ba67a..97eba95f 100644
--- a/lib/modules/maintenance/web/settings.html.heex
+++ b/lib/modules/maintenance/web/settings.html.heex
@@ -9,15 +9,13 @@
   <div class="container mx-auto px-4 py-6">
     <%!-- Header Section --%>
     <header class="w-full mb-6">
-      <div class="mb-4">
-        <%!-- Back Button --%>
-        <.link
-          navigate={PhoenixKit.Utils.Routes.path("/admin/modules")}
-          class="btn btn-outline btn-primary btn-sm"
-        >
-          <.icon name="hero-arrow-left" class="w-4 h-4" /> Back to Modules
-        </.link>
-      </div>
+      <%!-- Back Button --%>
+      <.link
+        navigate={PhoenixKit.Utils.Routes.path("/admin/modules")}
+        class="btn btn-outline btn-primary btn-sm"
+      >
+        <.icon name="hero-arrow-left" class="w-4 h-4" /> Back to Modules
+      </.link>
       <%!-- Title Section --%>
       <div class="text-center">
         <h1 class="text-2xl sm:text-4xl font-bold text-base-content mb-3">
diff --git a/lib/phoenix_kit_web/live/modules.html.heex b/lib/phoenix_kit_web/live/modules.html.heex
index a9826106..933cebf1 100644
--- a/lib/phoenix_kit_web/live/modules.html.heex
+++ b/lib/phoenix_kit_web/live/modules.html.heex
@@ -9,14 +9,12 @@
   <div class="container flex flex-col mx-auto px-4 py-6">
     <%!-- Header Section --%>
     <header class="w-full mb-6">
-      <div class="mb-4">
-        <.link
-          navigate={PhoenixKit.Utils.Routes.path("/admin")}
-          class="btn btn-outline btn-primary btn-sm"
-        >
-          <.icon name="hero-arrow-left" class="w-4 h-4 mr-2" /> Back to Dashboard
-        </.link>
-      </div>
+      <.link
+        navigate={PhoenixKit.Utils.Routes.path("/admin")}
+        class="btn btn-outline btn-primary btn-sm"
+      >
+        <.icon name="hero-arrow-left" class="w-4 h-4 mr-2" /> Back to Dashboard
+      </.link>
 
       <div class="text-center">
         <h1 class="text-2xl sm:text-4xl font-bold text-base-content mb-3">Modules</h1>
diff --git a/lib/phoenix_kit_web/live/modules/pages/pages.html.heex b/lib/phoenix_kit_web/live/modules/pages/pages.html.heex
index f0f7e05e..9980d3e7 100644
--- a/lib/phoenix_kit_web/live/modules/pages/pages.html.heex
+++ b/lib/phoenix_kit_web/live/modules/pages/pages.html.heex
@@ -9,15 +9,13 @@
   <div class="container flex flex-col mx-auto px-4 py-6">
     <%!-- Header Section --%>
     <header class="w-full mb-6">
-      <div class="mb-4">
-        <%!-- Back Button --%>
-        <.link
-          navigate={PhoenixKit.Utils.Routes.path("/admin/modules")}
-          class="btn btn-outline btn-primary btn-sm"
-        >
-          <PhoenixKitWeb.Components.Core.Icons.icon_arrow_left /> Back to Modules
-        </.link>
-      </div>
+      <%!-- Back Button --%>
+      <.link
+        navigate={PhoenixKit.Utils.Routes.path("/admin/modules")}
+        class="btn btn-outline btn-primary btn-sm"
+      >
+        <PhoenixKitWeb.Components.Core.Icons.icon_arrow_left /> Back to Modules
+      </.link>
 
       <%!-- Title Section --%>
       <div class="text-center">