diff --git a/assets/sass/components/_photos.scss b/assets/sass/components/_photos.scss
index 44d6d933..c8f66633 100644
--- a/assets/sass/components/_photos.scss
+++ b/assets/sass/components/_photos.scss
@@ -1,5 +1,6 @@
 .photos {
-  padding: 8vmin $pad-min 4vmin;
+  padding-bottom: 4vmin;
+  padding-top: 1em;
 }
 
 .photos__container {
diff --git a/assets/sass/components/_post.scss b/assets/sass/components/_post.scss
index 39b6ab44..12c3db9b 100644
--- a/assets/sass/components/_post.scss
+++ b/assets/sass/components/_post.scss
@@ -1,7 +1,6 @@
 .post {
-  border-bottom: 1px dashed $border-color;
   margin-top: 2em;
-  padding-bottom: 1.5em;
+  margin-bottom: 4em;
 
   img {
     max-width: 100%;
@@ -10,10 +9,6 @@
   & > * {
     @include container
   }
-
-  @media (prefers-color-scheme: dark) {
-    border-bottom: 1px dashed $border-color-dark;
-  }
 }
 
 .post__title {
diff --git a/assets/sass/components/_posts.scss b/assets/sass/components/_posts.scss
index d07ee0ec..0cdfcaa8 100644
--- a/assets/sass/components/_posts.scss
+++ b/assets/sass/components/_posts.scss
@@ -1,9 +1,8 @@
 .posts__pagination {
-  padding: 1em $pad-min;
-}
-
-.posts__pagination-container {
+  @include container;
   display: flex;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 .posts__next-link,
diff --git a/assets/sass/components/_site-header.scss b/assets/sass/components/_site-header.scss
index 365df871..03fc432c 100644
--- a/assets/sass/components/_site-header.scss
+++ b/assets/sass/components/_site-header.scss
@@ -1,9 +1,7 @@
 .site-header {
   padding: 0 $pad-min;
-  border-bottom: 1px dashed $text-color;
 
   @media (prefers-color-scheme: dark) {
-    border-bottom: 1px dashed $text-color-dark;
   }
 }
 
diff --git a/assets/sass/objects/_outer.scss b/assets/sass/elements/_main.scss
similarity index 73%
rename from assets/sass/objects/_outer.scss
rename to assets/sass/elements/_main.scss
index f0353783..7d9abc57 100644
--- a/assets/sass/objects/_outer.scss
+++ b/assets/sass/elements/_main.scss
@@ -1,3 +1,3 @@
-.outer {
+main {
   padding: 0 $pad-min;
 }
diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index 93c60a33..6b7f23a8 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -24,11 +24,11 @@
 @import "elements/headings";
 @import "elements/html";
 @import "elements/pre";
+@import "elements/main";
 
 // 5. Objects – class-based selectors which define undecorated design patterns,
 //    for example media object known from OOCSS
 @import "objects/container";
-@import "objects/outer";
 
 // 6. Components – specific UI components.
 //    This is where majority of our work takes place and our UI components
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 4b9d4a04..f05f2a7a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,11 +1,9 @@
 {{ define "main" }}
-  <article class="post outer">
+  <article class="post container">
     <header>
-      <div class="container">
-        <h2 class="post__title">{{.Title}}</h2>
+      <h2 class="post__title">{{.Title}}</h2>
 
-        <p class="post__date">{{.Date.Format "Jan 2, 2006"}}</p>
-      </div>
+      <p class="post__date">{{.Date.Format "Jan 2, 2006"}}</p>
     </header>
 
     {{.Content}}
diff --git a/layouts/index.html b/layouts/index.html
index 129de412..51d622e0 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,13 +1,13 @@
 {{ define "main" }}
-  <section class="home__about outer">
+  <section class="home__about">
     <article class="container">
       {{ .Content }}
     </article>
   </section>
 
-  <section class="home__photos outer">
+  <section class="home__photos">
     <article class="container">
-      <header>
+      <header class="home__header">
         <h2>Latest Photos</h2>
       </header>
 
@@ -26,21 +26,17 @@
   </section>
 
   <section class="home__blog">
-    <article>
-      <header class="outer">
-        <div class="container">
-          <h2>From the Blog</h2>
-        </div>
+    <article class="container">
+      <header class="home__header">
+        <h2>From the Blog</h2>
       </header>
 
       {{ range first 3 (where .Site.RegularPages "Section" "blog") }}
         {{ partial "blog_post_summary.html" . }}
       {{ end }}
 
-      <footer class="home__more outer">
-        <div class="container">
-          <p><a href="/blog">More →</a></p>
-        </div>
+      <footer class="home__more">
+        <p><a href="/blog">More posts →</a></p>
       </footer>
     </article>
   </section>
diff --git a/layouts/partials/blog_post_summary.html b/layouts/partials/blog_post_summary.html
index 819d354f..90340428 100644
--- a/layouts/partials/blog_post_summary.html
+++ b/layouts/partials/blog_post_summary.html
@@ -1,7 +1,7 @@
 <article class="post outer">
   <header>
     <div class="container">
-      <h3 class="post__title"><a href="{{.Permalink}}">{{.Title}}</a></h3>
+      <h3 class="post__title"><a href="{{.URL}}">{{.Title}}</a></h3>
 
       <p class="post__date">{{.Date.Format "Jan 2, 2006"}}</p>
     </div>
@@ -10,7 +10,7 @@
   {{ if .Truncated }}
     {{.Summary}}
 
-    <p class="post__read-more"><a href="{{.Permalink}}">Read on →</a></p>
+    <p class="post__read-more"><a href="{{.URL}}">Read on →</a></p>
   {{ else }}
     {{.Content}}
   {{ end }}
diff --git a/layouts/partials/photo_thumb.html b/layouts/partials/photo_thumb.html
index 7ab29ea9..7bcf652d 100644
--- a/layouts/partials/photo_thumb.html
+++ b/layouts/partials/photo_thumb.html
@@ -15,7 +15,7 @@
 {{ $tiny := .Scratch.Get "tiny" }}
 {{ $small := .Scratch.Get "small" }}
 
-<a class="photos__link" href={{.Permalink}}>
+<a class="photos__link" href={{.URL}}>
   <img class="photos__thumb"
     srcset="
     {{ if ge $src.Width "300" }}
diff --git a/layouts/section/blog.html b/layouts/section/blog.html
index eefaaf8e..031fb03a 100644
--- a/layouts/section/blog.html
+++ b/layouts/section/blog.html
@@ -6,14 +6,12 @@
   </section>
 
   <section class="posts__pagination">
-    <div class="container posts__pagination-container">
-      {{ if .Paginator.HasNext }}
-        <a class="posts__next-link" href="{{.Paginator.Next.URL}}">← Older</a>
-      {{ end }}
+    {{ if .Paginator.HasNext }}
+      <a class="posts__next-link" href="{{.Paginator.Next.URL}}">← Older</a>
+    {{ end }}
 
-      {{ if .Paginator.HasPrev }}
-        <a class="posts__prev-link" href="{{.Paginator.Prev.URL}}">Newer →</a>
-      {{ end }}
-    </div>
+    {{ if .Paginator.HasPrev }}
+      <a class="posts__prev-link" href="{{.Paginator.Prev.URL}}">Newer →</a>
+    {{ end }}
   </section>
 {{ end }}
diff --git a/layouts/section/photos.html b/layouts/section/photos.html
index ca44f364..c7d4fe6d 100644
--- a/layouts/section/photos.html
+++ b/layouts/section/photos.html
@@ -1,23 +1,19 @@
 {{ define "main" }}
-  <section class="photos">
-    <div class="photos__container">
-      {{ range (.Paginator 24).Pages }}
-        <article class="photos__thumb-container">
-          {{ partial "photo_thumb.html" . }}
-        </article>
-      {{ end }}
-    </div>
+  <section class="photos photos__container">
+    {{ range (.Paginator 24).Pages }}
+      <article class="photos__thumb-container">
+        {{ partial "photo_thumb.html" . }}
+      </article>
+    {{ end }}
   </section>
 
   <section class="posts__pagination">
-    <div class="container posts__pagination-container">
-      {{ if .Paginator.HasNext }}
-        <a class="posts__next-link" href="{{.Paginator.Next.URL}}">← Older</a>
-      {{ end }}
+    {{ if .Paginator.HasNext }}
+      <a class="posts__next-link" href="{{.Paginator.Next.URL}}">← Older</a>
+    {{ end }}
 
-      {{ if .Paginator.HasPrev }}
-        <a class="posts__prev-link" href="{{.Paginator.Prev.URL}}">Newer →</a>
-      {{ end }}
-    </div>
+    {{ if .Paginator.HasPrev }}
+      <a class="posts__prev-link" href="{{.Paginator.Prev.URL}}">Newer →</a>
+    {{ end }}
   </section>
 {{ end }}
diff --git a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
index 7309a833..93dce30d 100644
--- a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
+++ b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -365,20 +365,16 @@ pre {
   border-radius: 0.5rem;
   padding: 1em; }
 
+main {
+  padding: 0 6.5%; }
+
 .container {
   margin-left: auto;
   margin-right: auto;
   max-width: 40rem; }
 
-.outer {
-  padding: 0 6.5%; }
-
 .site-header {
-  padding: 0 6.5%;
-  border-bottom: 1px dashed #333; }
-  @media (prefers-color-scheme: dark) {
-    .site-header {
-      border-bottom: 1px dashed #ddd; } }
+  padding: 0 6.5%; }
 
 .site-header__container {
   margin-left: auto;
@@ -397,10 +393,12 @@ pre {
   text-align: right; }
 
 .posts__pagination {
-  padding: 1em 6.5%; }
-
-.posts__pagination-container {
-  display: flex; }
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 40rem;
+  display: flex;
+  margin-top: 1em;
+  margin-bottom: 1em; }
 
 .posts__next-link,
 .posts__prev-link {
@@ -413,18 +411,14 @@ pre {
   text-align: right; }
 
 .post {
-  border-bottom: 1px dashed #ccc;
   margin-top: 2em;
-  padding-bottom: 1.5em; }
+  margin-bottom: 4em; }
   .post img {
     max-width: 100%; }
   .post > * {
     margin-left: auto;
     margin-right: auto;
     max-width: 40rem; }
-  @media (prefers-color-scheme: dark) {
-    .post {
-      border-bottom: 1px dashed #666; } }
 
 .post__title {
   margin-bottom: 0.25em; }
@@ -436,7 +430,8 @@ pre {
   text-transform: uppercase; }
 
 .photos {
-  padding: 8vmin 6.5% 4vmin; }
+  padding-bottom: 4vmin;
+  padding-top: 1em; }
 
 .photos__container {
   margin-left: auto;