diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index f9885fac9..ce87d6f71 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -17,23 +17,24 @@ $if not isModal
 
     <div .main__content-body>
 
-      $maybe headline <- contentHeadline
-        <h1>
-          <!-- $maybe back <- lastMaybe parents
-            <a .breadcrumbs__link href="@{fst back}">#{snd back}  -->
-          ^{headline}
+      <section>
+        $maybe headline <- contentHeadline
+          <h1 .headline-one>
+            <!-- $maybe back <- lastMaybe parents
+              <a .breadcrumbs__link href="@{fst back}">#{snd back}  -->
+            ^{headline}
 
-      $if not isModal
-        <!-- prime page actions -->
-        ^{pageactionprime}
-
-      <!-- alerts -->
-      <div #alerts .alerts>
-        $forall (status, msg) <- mmsgs
-          $with status2 <- bool status "info" (status == "")
-            <div class="alert alert-#{status2}">
-              <div .alert__content>
-                #{msg}
+        $if not isModal
+          <!-- prime page actions -->
+          ^{pageactionprime}
 
       <!-- actual content -->
       ^{widget}
+
+      <!-- alerts -->
+      <div #alerts .alerts>
+          $forall (status, msg) <- mmsgs
+            $with status2 <- bool status "info" (status == "")
+              <div class="alert alert-#{status2}">
+                <div .alert__content>
+                  #{msg}
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index 32c8abac0..b0856707f 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -450,7 +450,7 @@ input[type="button"].btn-info:hover,
 }
 
 ul.list--inline {
-  
+
   display: inline-block;
   margin-left: 0;
 
@@ -526,18 +526,24 @@ ul.list--inline {
 }
 
 section {
-    padding: 0 0 12px;
-    margin: 0 0 12px;
+    padding-bottom: 20px;
+    margin-bottom: 20px;
     border-bottom: 1px solid #d3d3d3;
 
-}
+    + section {
+      margin-top: 20px;
+      padding-top: 20px;
+    }
 
-section:last-of-type {
-    padding: 0;
-    margin: 0;
-    border-bottom: none;
+    section {
+      border-bottom: none;
+    }
 }
 
 .pseudonym {
     font-family: monospace;
 }
+
+.headline-one {
+  margin-bottom: 15px;
+}
diff --git a/templates/widgets/pageactionprime.lucius b/templates/widgets/pageactionprime.lucius
index 9cd08c1db..831bdec11 100644
--- a/templates/widgets/pageactionprime.lucius
+++ b/templates/widgets/pageactionprime.lucius
@@ -1,10 +1,6 @@
-.page-nav-prime {
-  margin: 10px 0 20px;
-  background-color: var(--color-grey-light);
-}
-
 .pagenav__list-item {
   display: inline-block;
-  padding: 15px;
-  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+  padding: 7px 10px;
+  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.6);
+  margin: 10px 10px 0 0;
 }