diff --git a/themes/waterspill-en/static/css/style.css b/themes/waterspill-en/static/css/style.css
index 4236804..1cd2dc5 100644
--- a/themes/waterspill-en/static/css/style.css
+++ b/themes/waterspill-en/static/css/style.css
@@ -239,7 +239,7 @@ div.figure img {
 }
 
 
-@media screen and (max-width: 900px) {
+@media screen and (max-width: 899px) {
   body {
     padding:1rem;
   }
diff --git a/themes/waterspill-en/templates/base.html b/themes/waterspill-en/templates/base.html
index e818729..5d5a4dc 100644
--- a/themes/waterspill-en/templates/base.html
+++ b/themes/waterspill-en/templates/base.html
@@ -25,9 +25,10 @@
 <div id="container">
 
   <div id="header">
-  <h1><a href="{{ SITEURL }}/index.html">{{ SITENAME }}</h1>
-  {% if SITESUBTITLE %}<h2>{{ SITESUBTITLE }}</h2>{% endif %}
-  
+    <a href="{{ SITEURL }}/index.html">
+      <h1>{{ SITENAME }}</h1>
+      {% if SITESUBTITLE %}<h2>{{ SITESUBTITLE }}</h2>{% endif %}
+    </a>
   </div><!-- end #header -->
   
   <div id="topMenu">
@@ -40,7 +41,7 @@
         {% for item in AFTER_MENU %}
           <li><a href="{{ item.url }}">{{ item.name }}</li>
         {% endfor %}
-        <li><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate"><img src="/blog/theme/images/feed-icon-28x28.png" /></li>
+        <li><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate"><img src="/blog/theme/images/feed-icon-28x28.png" /></a></li>
     </ul>
   
   </div><!-- end #topMenu -->