diff --git a/app/views/elements/_element.html.erb b/app/views/elements/_element.html.erb
index 1c939d8..1571085 100644
--- a/app/views/elements/_element.html.erb
+++ b/app/views/elements/_element.html.erb
@@ -25,7 +25,7 @@
         </div>
       <% end %>
       <% safe_display(element.screenshot) do |s| %> 
-        <div data-controller="lightbox">
+        <div class="mb-3" data-controller="lightbox">
           <%= link_to(s) do %>
             <%= image_tag(s.variant(:thumbnail), class: "img-fluid", alt: "Screenshot des getesteten Elements") %>
           <% end %>
diff --git a/app/views/elements/_page_nav_row.html.slim b/app/views/elements/_page_nav_row.html.slim
index 29713b4..7ab20f2 100644
--- a/app/views/elements/_page_nav_row.html.slim
+++ b/app/views/elements/_page_nav_row.html.slim
@@ -1,13 +1,7 @@
-li id=dom_id(element, :page_nav_row) data={ "sortable-url": element_path(element), "form-name": "element", "position-attribute": "position" }
-  - if current_page
-    =< link_to("##{dom_id(element)}", data: { "turbo": false }) do
-      i.bi.bi-boxes.me-2
-      span id=dom_id(element, :page_nav_title)
-        = "#{element.number} #{element.title}"
-      i.bi.bi-grip-vertical.float-end.handle
-  - else 
-    =< link_to(report_path(element.report, page_id: element.page.id, anchor: dom_id(element)), data: { "turbo": false }) do
-      i.bi.bi-boxes.me-2
-      span id=dom_id(element, :page_nav_title)
-        =< "#{element.number} #{element.title}"
-      i.bi.bi-grip-vertical.float-end.handle
\ No newline at end of file
+li.d-flex id=dom_id(element, :page_nav_row) data={ "sortable-url": element_path(element), "form-name": "element", "position-attribute": "position" }
+  - url = current_page ? "##{dom_id(element)}" : report_path(element.report, page_id: element.page.id, anchor: dom_id(element))
+  i.bi.bi-boxes.me-2
+  =< link_to(url, data: { "turbo": false }, class: "me-auto") do
+    span id=dom_id(element, :page_nav_title)
+      = "#{element.number} #{element.title}"
+  i.bi.bi-grip-vertical.handle