diff --git a/themes/waterspill-en/static/css/style.css b/themes/waterspill-en/static/css/style.css
index 499f1a9..4236804 100644
--- a/themes/waterspill-en/static/css/style.css
+++ b/themes/waterspill-en/static/css/style.css
@@ -1,4 +1,5 @@
 dd { margin-left: 23px }
+.archives-mobile { display: none }
 
 /* *** General Styles *** */
 body  {
@@ -24,10 +25,6 @@ a:hover {
 	text-decoration: none;
 }
 
-p {
-	line-height: 1.5em;
-	padding: 5px 0;
-}
 
 h1,
 h2,
@@ -53,7 +50,7 @@ ol {
   list-style: none;
 }
 
-#topmenu ul li {
+#topMenu ul li {
   list-style: none;
 }
 
@@ -64,6 +61,10 @@ div.figure img {
   
 @media screen and (min-width: 900px) {
   * { margin: 0; padding: 0; }
+  p {
+  	line-height: 1.5em;
+  	padding: 5px 0;
+  }
   body {
     text-align: center;
   }
@@ -242,6 +243,7 @@ div.figure img {
   body {
     padding:1rem;
   }
+  .archives { display: none; }
 
   h2 {
   	background: url(../images/hr.gif) top center no-repeat;
@@ -252,11 +254,31 @@ div.figure img {
     display:none;
   }
 
-  #mainContent dl {
+  .blogItem h2 {
+    margin-bottom:0.25rem;
+  }
+  .blogItem h3 {
+  	font-size: 12px;
+    margin:0;
+  	padding: 0;
+    text-align:right;
   }
 
-  #mainContent dt {
-    font-size: 75%;
+  #header h2 {
+    display: none
+  }
+
+  #topMenu ul {
+  	background: url(../images/hr.gif) top center no-repeat;
+    padding-top:1rem;
+    margin-left:0px;
+    text-align: center;
+  }
+
+  #topMenu ul li {
+    display:inline;
+    font-size: 16pt;
+    text-transform: uppercase;
   }
 
   #sidebar-mobile {
diff --git a/themes/waterspill-en/templates/archives.html b/themes/waterspill-en/templates/archives.html
index c460e01..96c8230 100644
--- a/themes/waterspill-en/templates/archives.html
+++ b/themes/waterspill-en/templates/archives.html
@@ -1,24 +1,13 @@
 {% extends "base.html" %}
 {% block title %}Archives of {{ SITENAME }}{% endblock %}
 {% block content %}  
-
-<div class="blogItem">
-<dl>
-  <h2>Archives of {{ SITENAME }}</h2>
-  {% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
-      <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-  {% endfor %}
-</dl>
-
-
-</div>
-
-
-
+  <div class="blogItem .archives">
+    <dl>
+      <h2>Archives of {{ SITENAME }}</h2>
+        {% for article in dates %}
+          <dt>{{ article.locale_date }}</dt>
+          <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+        {% endfor %}
+    </dl>
+  </div>
 {% endblock %}
-
-
-
-
-
diff --git a/themes/waterspill-en/templates/base.html b/themes/waterspill-en/templates/base.html
index 914ad59..f8fc301 100644
--- a/themes/waterspill-en/templates/base.html
+++ b/themes/waterspill-en/templates/base.html
@@ -35,7 +35,7 @@
         {% for item in BEFORE_MENU %}
           <li><a href="{{ item.url }}">{{ item.name }}</li>
         {% endfor %}
-    	<li><a href="{{ SITEURL }}/index.html">Home</a></li>
+    	  <li><a href="{{ SITEURL }}/index.html">Home</a></li>
         <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
         {% for item in AFTER_MENU %}
           <li><a href="{{ item.url }}">{{ item.name }}</li>
@@ -115,10 +115,6 @@
 
 <div class="clearfloat"></div>
 
-  <div id="footer">
-  
-    <p>Proudly powered by <a href="http://getpelican.com">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
-  </div><!-- end #footer -->
 
  <div id="sidebar-mobile">
     <ul>
@@ -181,8 +177,6 @@
     </ul>
   </div><!-- end #sidebar -->
 
-
-
 </div><!-- end #container -->
 {% include 'analytics.html' %}
 </body>
diff --git a/themes/waterspill-en/templates/index.html b/themes/waterspill-en/templates/index.html
index 7f14be6..bf3547e 100644
--- a/themes/waterspill-en/templates/index.html
+++ b/themes/waterspill-en/templates/index.html
@@ -13,7 +13,7 @@
     {% endfor %}
 
 
-<dl>
+<div class="archives">
   <h2>Archives of {{ SITENAME }}</h2>
   {% for article in dates %}
   {% if loop.index > 3 %}
@@ -21,7 +21,7 @@
       <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
       {% endif %}
   {% endfor %}
-</dl>
+</div>
 
 {% endif %}
 {% endblock content %}