diff --git a/_includes/post_macro.html b/_includes/post_macro.html
index 6e603acd..165ccf37 100644
--- a/_includes/post_macro.html
+++ b/_includes/post_macro.html
@@ -1,17 +1,9 @@
-<div class="section-item">
-    <div class="title">
-        <h3>
-            <a href="{{ base }}{{ post.url }}">{{ post.title }}</a>
-        </h3>
-    </div>
-    <div class="date">
-        <h5>{{ post.date | date: "%Y-%m-%d" }}</h5>
-    </div>
-    <div class="user">
-        <h5>
-            Posted by {{ post.author }}
-        </h5>
-    </div>
+<article class="section-item">
+    <header>
+        <h3><a href="{{ base }}{{ post.url }}">{{ post.title }}</a></h3>
+        <div class="date"><time>{{ post.date | date: "%Y-%m-%d" }}</time></div>
+        <p class="user">Posted by {{ post.author }}</p>
+    </header>
     <div class="content">
         {% if include.excerpt %}
         {{ post.excerpt }}
@@ -23,4 +15,4 @@ <h5>
         {{ post.content }}
         {% endif %}
     </div>
-</div>
+</article>
diff --git a/_layouts/default.html b/_layouts/default.html
index f362f076..a4af1521 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,7 +2,6 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta name="Description" content="An open source simulator based on the classic game Transport Tycoon Deluxe. It attempts to mimic the original game as closely as possible while extending it with new features." />
         <meta name="Keywords" content="Transport,Tycoon,Deluxe,TTDLX,TTD,OpenTTD,OTTD" />
         <link rel="icon" href="{{ site.staticurl }}/favicon.ico" type="image/icon" />
@@ -16,10 +15,10 @@
         <script type="text/javascript" src="{{ site.staticurl }}/js/{{ filename }}"></script>
         {% endfor %}
         {% feed_meta %}
-        <title>OpenTTD {% if layout.section_title != nil %}| {{layout.section_title}}{% endif %} | {{ page.title }}</title>
+        <title>OpenTTD{% if layout.section_title != nil %} | {{layout.section_title}}{% endif %} | {{ page.title }}</title>
     </head>
     <body>
-        <div id="header">
+        <header id="header">
             {% assign latest_stable = site.downloads | where_exp: "download", "download.id == '/downloads/openttd-releases/latest'" | last %}
             {% assign latest_testing = site.downloads | where_exp: "download", "download.id == '/downloads/openttd-releases/testing'" | last %}
             {% assign latest_nightly = site.downloads | where_exp: "download", "download.id == '/downloads/openttd-nightlies/latest'" | last %}
@@ -30,67 +29,45 @@
             {% assign nightly_version = latest_nightly.version | split: "-" | slice: 0 %}
             {% endif %}
 
-            <div id="header-left"></div>
-            <div id="header-right"></div>
-
-            {% if latest_stable.date < latest_testing.date %}
-            <div id="download-fast-3">
-            {% else %}
-            <div id="download-fast-2">
-            {% endif %}
-                <h5><a href="{{ site.baseurl }}{{ latest_stable.url }}">Download stable ({{ latest_stable.version }})</a></h5>
+            <ul id="header-download">
+                <li><a href="{{ site.baseurl }}{{ latest_stable.url }}">Download stable ({{ latest_stable.version }})</a></li>
                 {% if latest_stable.date < latest_testing.date %}
-                <h5><a href="{{ site.baseurl }}{{ latest_testing.url }}">Download testing ({{ latest_testing.version }})</a></h5>
+                <li><a href="{{ site.baseurl }}{{ latest_testing.url }}">Download testing ({{ latest_testing.version }})</a></li>
                 {% endif %}
-                <h5><a href="{{ site.baseurl }}{{ latest_nightly.url }}">Download nightly ({{ nightly_version }})</a></h5>
-            </div>
+                <li><a href="{{ site.baseurl }}{{ latest_nightly.url }}">Download nightly ({{ nightly_version }})</a></li>
+            </ul>
             <div id="header-logo">
                 <div id="openttd-logo">
                     <div id="openttd-logo-text"><a href="{{ site.baseurl }}"><img src="{{ site.staticurl }}/img/layout/openttd-logo.png" alt="OpenTTD" /></a></div>
                 </div>
             </div>
-        </div>
-        <div id="navigation">
-            <div id="navigation-left"></div>
-            <div id="navigation-right"></div>
-            <ul id="navigation-bar">
-                <li class="{% if page.active_nav == 'home' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/">Home</a>
-                </li>
-                <li class="{% if page.active_nav == 'about' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/about.html">About</a>
-                </li>
+        </header>
+        <nav id="navigation-bar">
+            <ul>
+                <li><a{% if page.active_nav != 'home' %} href="{{ site.baseurl }}/"{% endif %}>Home</a></li>
+                <li><a{% if page.active_nav != 'about' %} href="{{ site.baseurl }}/about.html"{% endif %}>About</a></li>
                 <li><a href="https://wiki.openttd.org/">Manual</a></li>
-                <li class="{% if page.active_nav == 'screenshots' or layout.active_nav == 'screenshots' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/screenshots.html">Screenshots</a>
-                </li>
+                <li><a{% if page.active_nav != 'screenshots' or layout.active_nav == 'screenshots' %} href="{{ site.baseurl }}/screenshots.html"{% endif %}>Screenshots</a></li>
                 <li><a href="https://servers.openttd.org">Servers</a></li>
-                <li class="{% if page.active_nav == 'development' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/development.html">Development</a>
-                </li>
+                <li><a{% if page.active_nav != 'development' %} href="{{ site.baseurl }}/development.html"{% endif %}>Development</a></li>
                 <li><a href="https://forum.openttd.org/">Forum</a></li>
                 <li><a href="https://wiki.openttd.org/Community">Community</a></li>
-                <li class="{% if page.active_nav == 'contact' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/contact.html">Contact</a>
-                </li>
-                <li class="{% if page.active_nav == 'donate' %}selected{% endif %}">
-                    <a href="{{ site.baseurl }}/donate.html">Donate</a>
-                </li>
+                <li><a{% if page.active_nav != 'contact' %} href="{{ site.baseurl }}/contact.html"{% endif %}>Contact</a></li>
+                <li><a{% if page.active_nav != 'donate' %} href="{{ site.baseurl }}/donate.html"{% endif %}>Donate</a></li>
             </ul>
-        </div>
-        <div id="content-main">
+        </nav>
+        <main id="content-main">
             {{ content }}
-            <hr id="hr-clear" />
+        </main>
+        <footer>
             <div id="content-bottom">
-                <div id="content-bottom-links">
-                    <a href="{{ site.baseurl }}/policy.html">Privacy Policy</a> |
-                    <a href="https://account.openttd.org/en/login">Login</a> |
-                    <a href="{{ site.baseurl }}/contact.html">Contact</a>
-                </div>
-                <div id="content-bottom-copyright">
-                    Copyright &copy; 2005-{{ site.time | date: '%Y' }} OpenTTD Team
-                </div>
+                <ul>
+                    <li><a href="{{ site.baseurl }}/policy.html">Privacy Policy</a></li>
+                    <li><a href="https://account.openttd.org/en/login">Login</a></li>
+                    <li><a href="{{ site.baseurl }}/contact.html">Contact</a></li>
+                </ul>
+                <p id="content-bottom-copyright">Copyright &copy; 2005-{{ site.time | date: '%Y' }} OpenTTD Team</p>
             </div>
-        </div>
+        </footer>
     </body>
 </html>
