diff --git a/site/themes/default/assets/src/base.css b/site/themes/default/assets/src/base.css
index f37b3396..f409ccaf 100644
--- a/site/themes/default/assets/src/base.css
+++ b/site/themes/default/assets/src/base.css
@@ -1,3 +1,7 @@
 body {
     @apply bg-white text-black text-base;
 }
+
+a {
+    @apply underline;
+}
diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index c55506e0..bb3c5b66 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -33,24 +33,28 @@
               <div class="w-full lg:w-2/12
                           text-center lg:text-left
                           float-left text-white p-2 uppercase tracking-wide">
-                <a href="{{ base_url() }}" class="w-full lg:w-2/12 pl-2 pr-2 text-center text-base logo no-underline">{{ registry.settings.title|e('html') }}</a>
+                <a href="{{ base_url() }}" class="w-full lg:w-2/12 text-center text-base no-underline">{{ registry.settings.title|e('html') }}</a>
               </div>
               <div class="w-full float-right lg:w-9/12 font-noirpro-semibold">
                 <div class="text-right p-2">
                     {% for item in entries.fetch('', {'order_by': {'field': 'menu_item_order', 'direction': 'asc'}}) %}
                         {% if item.menu_item_title %}
-                        <a href="{{ base_url() }}/{{ item.link }}"
-                           class="{% if item.menu_item_url in entry.slug %}border-white{% endif %}
-                                   uppercase
-                                   relative
-                                   block
-                                   text-white
-                                   text-center
-                                   mr-0
-                                   nav-item
-                                   lg:mr-4
-                                   lg:inline-block">
-                                   {{ item.title }}
+                        <a href="{{ base_url() }}/{{ item.menu_item_url }}"
+                           class="uppercase
+                                  relative
+                                  block
+                                  text-white
+                                  text-center
+                                  no-underline
+                                  mr-0
+                                  nav-item
+                                  border-black
+                                  border-b-2
+                                  hover:border-white
+                                  lg:mr-4
+                                  lg:inline-block
+                                  {% if item.menu_item_url in entry.slug %}border-white{% endif %}">
+                                  {{ item.menu_item_title }}
                                </a>
                         {% endif %}
                     {% endfor %}
@@ -60,8 +64,8 @@
         </nav>
 
         <main role="main" class="container">
-            <section id="content" class="p-10">{% block content %}{% endblock %}</section>
-            <footer class="text-center px-10 pt-5 pb-10">
+            <section id="content" class="pl-16 pr-16 pt-6 pb-6">{% block content %}{% endblock %}</section>
+            <footer class="text-center pl-16 pr-16 pt-5 pb-10">
                 {% block footer %}
                     {{ tr('site_powered_by_flextype')|raw }}
                 {% endblock %}