diff --git a/app/public/static/main.css b/app/public/static/main.css
index 07f3e45..55c3730 100644
--- a/app/public/static/main.css
+++ b/app/public/static/main.css
@@ -6,15 +6,39 @@ body {
   box-sizing: border-box;
   max-width: 1200px;
   margin: 0 auto;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
+}
+
+header {
+  float: left;
+  padding: 0.25em 1em;
+}
+header h1 {
+  margin: 0;
+  padding: 0;
+}
+
+nav {
+  float: right;
+  padding: 0.25em 1em;
+}
+nav ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+nav ul li {
+  display: inline;
+}
+nav ul li:last-child {
+  margin-left: 1em;
 }
 
 main {
+  clear: both;
   background-color: #fff;
   border: 1px solid #ccc;
   padding: 1em;
+  box-sizing: border-box;
 }
 
 footer {
diff --git a/app/templates/layouts/skeleton.twig b/app/templates/layouts/skeleton.twig
index a4e67af..1e01c87 100644
--- a/app/templates/layouts/skeleton.twig
+++ b/app/templates/layouts/skeleton.twig
@@ -11,13 +11,12 @@
 <body>
     <div class="container">
         <header>
-            <h1>Slovocast</h1>
+            <h1><a href="/home">Slovocast</a></h1>
             {% block header %}{% endblock %}
         </header>
 
         <nav>
             <ul>
-                <li><a href="/home">Home</a></li>
                 {% if logged_in %}
                     <li><a href="/dashboard">Dashboard</a></li>
                 {% else %}
