diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index 324ee34..9d3f2bf 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -33,6 +33,7 @@ textarea {
 
 .footer {
     text-align: center;
+    margin-bottom: 40px;
 }
 
 .description {
diff --git a/rrs/fixtures/initial_data.json b/rrs/fixtures/initial_data.json
index e2f98a0..03b8f0d 100644
--- a/rrs/fixtures/initial_data.json
+++ b/rrs/fixtures/initial_data.json
@@ -3,7 +3,7 @@
         "pk": 0, 
         "model": "rrs.maintainer", 
         "fields": {
-            "name": "No Maintainer", 
+            "name": "No maintainer", 
             "email": ""
         }
     },
diff --git a/rrs/static/css/rrs-additional.css b/rrs/static/css/rrs-additional.css
index c199c1c..d052540 100644
--- a/rrs/static/css/rrs-additional.css
+++ b/rrs/static/css/rrs-additional.css
@@ -35,6 +35,10 @@
     margin-top: 5px;
 }
 
+.nav-pills {
+	margin-top: 40px;
+}
+
 /* Sorting styles  */
 th > a, th.muted {
     font-weight: normal;
diff --git a/rrs/views.py b/rrs/views.py
index e28e237..9b8551a 100644
--- a/rrs/views.py
+++ b/rrs/views.py
@@ -227,7 +227,7 @@ class RecipeListView(ListView):
         context['upstream_status_choices'] = [ruch['N'], ruch['C'], ruch['Y'], ruch['U']]
 
         context['maintainer_name'] = self.maintainer_name
-        context['set_maintainers'] =  ['All', 'No Maintainer']
+        context['set_maintainers'] =  ['All', 'No maintainer']
         all_maintainers = []
         for rm in RecipeMaintainer.objects.filter(history =
                 self.recipe_maintainer_history).values(
diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html
index ceee760..3339000 100644
--- a/templates/rrs/base_toplevel.html
+++ b/templates/rrs/base_toplevel.html
@@ -87,7 +87,7 @@
                 <li>
                 <a href="{% url 'recipes' release_name milestone_name %}{{ extra_url_param }}">
 		{% endif %}
-                Recipes status</a>
+                Recipes upstream status</a>
                 </li>
 
                 {% if this_url_name == 'maintainers' %}
diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html
index cd0fe7a..e52f3c7 100644
--- a/templates/rrs/maintainers.html
+++ b/templates/rrs/maintainers.html
@@ -40,10 +40,10 @@
         <th class="sorted">Maintainer</th>
         <th class="muted">Assigned recipes</th>
         <th class="muted">Up-to-date</th>
-        <th>Not updated</th>
+        <th class="muted">Not updated</th>
         <th class="muted">Can't be updated</th>
         <th class="muted">Unknown</th>
-        <th>% done</th>
+        <th class="muted">% done</th>
 
         {% for i in intervals %}
         {% if current_interval == forloop.counter0 %}
diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html
index 3e2c55b..1506fec 100644
--- a/templates/rrs/recipedetail.html
+++ b/templates/rrs/recipedetail.html
@@ -31,20 +31,20 @@
     <div class="navbar-inner">
         <ul class="nav">
             {% if upstream_status == "Up-to-date" %}
-            <li class="lead">Upstream status: <strong class="text-success">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-success">{{ upstream_status }}</span></li>
             {% elif upstream_status == "Not updated" %}
-            <li class="lead">Upstream status: <strong class="text-error">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-error">{{ upstream_status }}</span></li>
             {% elif upstream_status == "Can't be updated" %}
-            <li class="lead">Upstream status: <strong class="muted">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="muted">{{ upstream_status }}</span></li>
             {% else %}
-            <li class="lead">Upstream status: <strong class="text-warning">{{ upstream_status }}</strong></li>
+            <li class="lead">Upstream status: <span class="text-warning">{{ upstream_status }}</span></li>
             {% endif %}
             {% if upstream_status == "Not updated" or upstream_status == "Can't be updated" %}
             <li class="divider-vertical"></li>
-            <li class="lead">Upstream version: <strong>{{ upstream_version }}</strong></li>
+            <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
             {% endif %}
             <li class="divider-vertical"></li>
-            <li class="lead">Maintainer: <strong><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></strong></li>
+            <li class="lead">Maintainer: <span><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
             <li class="divider-vertical"></li>
         </ul>
     </div>