diff --git a/src/_includes/footer.njk b/src/_includes/footer.njk
index b474896..ce8ccdb 100644
--- a/src/_includes/footer.njk
+++ b/src/_includes/footer.njk
@@ -1,4 +1,4 @@
-<footer class="footer_main">
+<footer class="footer-main">
   Made with <a href="https://www.11ty.dev/">11ty</a>.
   {% if page.date %}<i>Last updated on {{ page.date | postDate }}</i>{% endif %}
 </footer>
\ No newline at end of file
diff --git a/src/css/global.css b/src/css/global.css
index fabaf2d..91ac5cf 100644
--- a/src/css/global.css
+++ b/src/css/global.css
@@ -56,7 +56,7 @@ h5,
 h6 {
   text-align: center;
 }
-@media screen and (min-width: 600px) {
+@media screen and (min-width: 768px) {
   h1,
   h2,
   h3,
@@ -95,11 +95,21 @@ article {
     margin: 0 2em;
   }
 }
-
-main :where(ol, ul),
-article :where(ol, ul) {
+main ol,
+main ul,
+article ol,
+article ul {
   all: revert;
-  margin: 0;
+  margin-bottom: 1em;
+}
+main p,
+article p {
+  line-height: 1.5;
+  margin-bottom: 1em;
+}
+main :last-child,
+article :last-child {
+  margin-bottom: 0;
 }
 
 header.header_main {
@@ -124,30 +134,18 @@ a.logo:active {
   text-decoration: none;
 }
 
-.navbar :where(li) {
+nav.navbar {
+  margin-bottom: 1em;
+}
+nav.navbar li {
   display: inline-flex;
 }
 
-p {
-  line-height: 1.5;
-  margin-bottom: 1em;
-}
-
-ul,
-ol {
-  margin-bottom: 1em;
-}
-
-footer.footer_main {
+footer.footer-main {
   margin: 2em 1em 1em 1em;
   text-align: center;
 }
 
-main > :last-child,
-header > :last-child {
-  margin-bottom: 0px;
-}
-
 .float-right {
   margin: auto;
   margin-bottom: 1em;
diff --git a/src/css/global.css.map b/src/css/global.css.map
index 1d22525..6e75eb0 100644
--- a/src/css/global.css.map
+++ b/src/css/global.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["_colors.scss","_fonts.scss","global.scss","_mixins.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAGA;EACE;EACA;;ACLF;AAAA;AAAA;AAAA;AAWA;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;ACpBA;EDcF;AAAA;AAAA;AAAA;AAAA;AAAA;IAQI;;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,OA5CG;EA6CH;EACA;EACA;EACA;EACA;;AC9CA;EDsCF;AAAA;IAUI;;;;AAIJ;AAAA;EAEE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;AAAA;EAGE;EACA,OFnCY;EEoCZ;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AC7GA;EDwGF;IAOI;IACA;;;;AAIJ;EACE;EACA;EACA","file":"global.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["_colors.scss","_fonts.scss","global.scss","_mixins.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAGA;EACE;EACA;;ACLF;AAAA;AAAA;AAAA;AAWA;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;;ACpBA;EDcF;AAAA;AAAA;AAAA;AAAA;AAAA;IAQI;;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA,OA5CG;EA6CH;EACA;EACA;EACA;EACA;;AC9CA;EDsCF;AAAA;IAUI;;;AAGF;AAAA;AAAA;AAAA;EAEE;EACA;;AAGF;AAAA;EACE;EACA;;AAGF;AAAA;EACE;;;AAIJ;EACE;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAEE;;;AAGF;AAAA;AAAA;EAGE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AC3GA;EDsGF;IAOI;IACA;;;;AAIJ;EACE;EACA;EACA","file":"global.css"}
\ No newline at end of file
diff --git a/src/css/global.scss b/src/css/global.scss
index deec7a1..5617686 100644
--- a/src/css/global.scss
+++ b/src/css/global.scss
@@ -32,7 +32,7 @@ h4,
 h5,
 h6 {
   text-align: center;
-  @include breakpoint("sm") {
+  @include breakpoint("md") {
     text-align: left;
   }
 }
@@ -61,12 +61,21 @@ article {
   @include breakpoint("sm") {
     margin: 0 2em;
   }
-}
 
-main :where(ol, ul),
-article :where(ol, ul) {
-  all: revert;
-  margin: 0;
+  ol,
+  ul {
+    all: revert;
+    margin-bottom: 1em;
+  }
+
+  p {
+    line-height: 1.5;
+    margin-bottom: 1em;
+  }
+
+  :last-child {
+    margin-bottom: 0;
+  }
 }
 
 header.header_main {
@@ -87,34 +96,23 @@ a.logo,
 a.logo:hover,
 a.logo:active {
   font-size: 3em;
-  color: $fg-logo;
+  color: #{$fg-logo};
   text-decoration: none;
 }
 
-.navbar :where(li) {
-  display: inline-flex;
-}
-
-p {
-  line-height: 1.5;
+nav.navbar {
   margin-bottom: 1em;
+
+  li {
+    display: inline-flex;
+  }
 }
 
-ul,
-ol {
-  margin-bottom: 1em;
-}
-
-footer.footer_main {
+footer.footer-main {
   margin: 2em 1em 1em 1em;
   text-align: center;
 }
 
-main > :last-child,
-header > :last-child {
-  margin-bottom: 0px;
-}
-
 .float-right {
   margin: auto;
   margin-bottom: 1em;