diff --git a/static/style.css b/static/style.css
index 3cfbde0..aa60628 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1,3 +1,8 @@
+@keyframes fade-in {
+  0% { opacity: 0; }
+  100% { opacity: 1; }
+}
+
 body {
   font-family: sans-serif;
   margin: 0;
@@ -27,9 +32,14 @@ body {
   font-weight: bold;
 }
 
+#menu {
+  animation: fade-in ease-in-out .5s;
+}
+
 #content {
   margin: 50px 0px;
   text-align: center;
+  animation: fade-in ease-in-out .5s;
 }
 
 .file {
diff --git a/templates/base.html b/templates/base.html
index a528ba4..b291d51 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,9 +8,11 @@
     <div>
       <span id="cloud-name">{{ cloud_name }}</span><span id="directory-name">{{ config["directory"] }}</span>
     </div>
-    {% block nav_content %}{% endblock %}
+    <div id="menu">
+      {% block menu %}{% endblock %}
+    </div>
   </div>
-  <div id="content">
+  <div id="content" class="a-fade-in">
     {% block content %}{% endblock %}
   </div>
 </div>
diff --git a/templates/directory.html b/templates/directory.html
index 5b2c985..92bef8a 100644
--- a/templates/directory.html
+++ b/templates/directory.html
@@ -1,21 +1,19 @@
 {% extends "base.html" %}
-{% block nav_content %}
-  <div>
-    {% if config["upload"] %}
-      <form action="/{{ config["directory"] }}" enctype="multipart/form-data" method="post">
-        <label class="button upload">
-          <input type="file" name="file" onchange="this.form.submit()">
-          Upload
-        </label>
-      </form>
-    {% endif %}
-    {% if config["hashed_password"] %}
-      <form action="/{{ config["directory"] }}" method="post">
-        <input hidden type="text" name="logout">
-        <input type="submit" class="button logout" value="Logout">
-      </form>
-    {% endif %}
-  </div>  
+{% block menu %}
+  {% if config["upload"] %}
+    <form action="/{{ config["directory"] }}" enctype="multipart/form-data" method="post">
+      <label class="button upload">
+        <input type="file" name="file" onchange="this.form.submit()">
+        Upload
+      </label>
+    </form>
+  {% endif %}
+  {% if config["hashed_password"] %}
+    <form action="/{{ config["directory"] }}" method="post">
+      <input hidden type="text" name="logout">
+      <input type="submit" class="button logout" value="Logout">
+    </form>
+  {% endif %}
 {% endblock %}
 {% block content %}
   {% for f in files %}