diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte
index bcfcfb90..2f485287 100644
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -234,7 +234,7 @@
 			{/if}
 			{#if store.state.jwtinfo.userdetails.permissions.includes("STATION:GET")}
 				<a
-					class:activenav={$router.path === "/scanstations/"}
+					class:activenav={$router.path.includes("/scanstations/")}
 					class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
 					href="/scanstations/"
 				>
@@ -256,7 +256,7 @@
 			{/if}
 			{#if store.state.jwtinfo.userdetails.permissions.includes("STATSCLIENT:GET")}
 				<a
-					class:activenav={$router.path === "/statsclients/"}
+					class:activenav={$router.path.includes("/statsclients/")}
 					class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
 					href="/statsclients/"
 				>
@@ -278,7 +278,7 @@
 			{/if}
 			{#if store.state.jwtinfo.userdetails.permissions.includes("USER:GET")}
 				<a
-					class:activenav={$router.path === "/users/"}
+					class:activenav={$router.path.includes("/users/")}
 					class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
 					href="/users/"
 				>
diff --git a/src/components/groups/GroupDetail.svelte b/src/components/groups/GroupDetail.svelte
index e531d009..63d0ad39 100644
--- a/src/components/groups/GroupDetail.svelte
+++ b/src/components/groups/GroupDetail.svelte
@@ -126,8 +126,7 @@
       </div>
     </div>
     <div class="mb-8 text-3xl font-extrabold leading-tight">
-      {original_data.name}
-      <span data-id="group_actions_${editable.id}">
+      <div data-id="group_actions_${editable.id}">
         {#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:DELETE")}
           {#if delete_triggered}
             <button
@@ -164,7 +163,7 @@
             >{$_("save-changes")}</button
           >
         {/if}
-      </span>
+      </div>
     </div>
     <!--  -->
     <div class="text-sm w-full">
diff --git a/src/components/groups/GroupPermissions.svelte b/src/components/groups/GroupPermissions.svelte
index d15fe5db..8c7ee423 100644
--- a/src/components/groups/GroupPermissions.svelte
+++ b/src/components/groups/GroupPermissions.svelte
@@ -134,9 +134,7 @@
       </div>
     </div>
     <div class="mb-8 text-3xl font-extrabold">
-      {$_("permissions")}:
-      {original_data.name}
-      <span>
+      <div>
         {#if promises.length === 0}
           <button
             disabled={save_enabled}
@@ -153,7 +151,7 @@
             >{$_("applying-changes")}</button
           >
         {/if}
-      </span>
+      </div>
     </div>
     <!--  -->
     <div class="flex flex-wrap -mx-1 overflow-hidden">
diff --git a/src/components/scans/ScanDetail.svelte b/src/components/scans/ScanDetail.svelte
index bb80203c..ae2381f3 100644
--- a/src/components/scans/ScanDetail.svelte
+++ b/src/components/scans/ScanDetail.svelte
@@ -140,7 +140,7 @@
               >
             </li>
             <li class="flex items-center">
-              <span class="mr-2">{original_data.id}</span>
+              <span class="mr-2">#{original_data.id}</span>
             </li>
           </ol>
         </nav>
diff --git a/src/components/statsclients/StatsClientDetail.svelte b/src/components/statsclients/StatsClientDetail.svelte
index b922e51a..b3df111b 100644
--- a/src/components/statsclients/StatsClientDetail.svelte
+++ b/src/components/statsclients/StatsClientDetail.svelte
@@ -76,8 +76,7 @@
       </div>
     </div>
     <div class="mb-8 text-3xl font-extrabold leading-tight">
-      #{original_data.id}
-      <span data-id="stations_actions_${original_data.id}">
+      <div data-id="stations_actions_${original_data.id}">
         {#if store.state.jwtinfo.userdetails.permissions.includes("STATSCLIENT:DELETE")}
           {#if delete_triggered}
             <button
@@ -104,7 +103,7 @@
             >
           {/if}
         {/if}
-      </span>
+      </div>
     </div>
     <!--  -->
     <div class="text-sm w-full">