diff --git a/views/about.handlebars b/views/about.handlebars
index eb3bfc6c..29bb110e 100644
--- a/views/about.handlebars
+++ b/views/about.handlebars
@@ -1,4 +1,4 @@
-{{> topBar}}
+{{> navBar}}
 <div class="row row--full-height">
     <div class="column column--5 column--med-10 align-content-top">
         <div class="row row--short">
diff --git a/views/channel.handlebars b/views/channel.handlebars
index 9c1733fc..488bc9fa 100644
--- a/views/channel.handlebars
+++ b/views/channel.handlebars
@@ -1,4 +1,4 @@
-{{> topBar}}
+{{> navBar}}
 <div class="row row--full-height">
     <h2>{{this.channelName}}<span class="h2--secondary">:{{this.longChannelId}}</span></h2>
     <p>Below is all the free content in this channel.</p>
diff --git a/views/fourOhFour.handlebars b/views/fourOhFour.handlebars
index b3b88595..ac0b00cc 100644
--- a/views/fourOhFour.handlebars
+++ b/views/fourOhFour.handlebars
@@ -1,6 +1,5 @@
-
-	{{> topBar}}
-	<div>
-		<h3>404: Not Found</h3>
-		<p>That page does not exist.  Return <a href="/">home</a>.</p>
-	</div>
+{{> navBar}}
+<div>
+    <h3>404: Not Found</h3>
+    <p>That page does not exist.  Return <a href="/">home</a>.</p>
+</div>
diff --git a/views/index.handlebars b/views/index.handlebars
index f053baec..25d17387 100644
--- a/views/index.handlebars
+++ b/views/index.handlebars
@@ -1,4 +1,4 @@
-{{> topBar}}
+{{> navBar}}
 <div class="row row--full-height">
     <div id="primary-dropzone-wrapper">
         <div id="primary-dropzone" class="dropzone" ondrop="drop_handler(event);" ondragover="dragover_handler(event);" ondragend="dragend_handler(event)" onclick="triggerFileChooser('siofu_input', event)">
diff --git a/views/login.handlebars b/views/login.handlebars
index fed59709..da1d0f2e 100644
--- a/views/login.handlebars
+++ b/views/login.handlebars
@@ -1,4 +1,4 @@
-{{> topBar}}
+{{> navBar}}
 
 <div class="row row--full-height">
     <div class="column column--5 column--med-10 align-content-top">
diff --git a/views/new.handlebars b/views/new.handlebars
index 3e8870c7..25adda81 100644
--- a/views/new.handlebars
+++ b/views/new.handlebars
@@ -1,5 +1,4 @@
-
-	{{> topBar}}
+	{{> navBar}}
 	<div>
 		<h2>New on Spee.ch</h2>
 		<p><i>The 25 most recent publishes on spee.ch</i></p>
diff --git a/views/noChannel.handlebars b/views/noChannel.handlebars
index 3b68d168..8e146980 100644
--- a/views/noChannel.handlebars
+++ b/views/noChannel.handlebars
@@ -1,5 +1,4 @@
-
-	{{> topBar}}
+	{{> navBar}}
 	<div>
 		<h3>No Claims</h3>
 		<p>There are no free assets on this channel.</p>
diff --git a/views/noClaims.handlebars b/views/noClaims.handlebars
index e1f01bda..edc1c28d 100644
--- a/views/noClaims.handlebars
+++ b/views/noClaims.handlebars
@@ -1,7 +1,6 @@
-
-	{{> topBar}}
-	<div>
-		<h3>No Claims</h3>
-		<p>There are no free assets at that claim.  You should publish one at <a href="/">spee.ch</a>.</p>
-		<p>NOTE: it is possible your claim was published, but it is still being processed by the blockchain</p>
-	</div>
+{{> navBar}}
+<div class="row">
+    <h3>No Claims</h3>
+    <p>There are no free assets at that claim.  You should publish one at <a href="/">spee.ch</a>.</p>
+    <p>NOTE: it is possible your claim was published, but it is still being processed by the blockchain</p>
+</div>
diff --git a/views/partials/topBar.handlebars b/views/partials/navBar.handlebars
similarity index 100%
rename from views/partials/topBar.handlebars
rename to views/partials/navBar.handlebars
diff --git a/views/popular.handlebars b/views/popular.handlebars
index 9fc49d31..cf5a961d 100644
--- a/views/popular.handlebars
+++ b/views/popular.handlebars
@@ -1,4 +1,4 @@
-{{> topBar}}
+{{> navBar}}
 <div class="row">
     {{#each trendingAssets}}
         {{> contentListItem}}
diff --git a/views/show.handlebars b/views/show.handlebars
index 1d53ec79..7143c2c4 100644
--- a/views/show.handlebars
+++ b/views/show.handlebars
@@ -1,5 +1,5 @@
 
-	{{> topBar}}
+	{{> navBar}}
     <div class="row row--full-height">
             <div class="column column--10">
                 <!-- title -->
diff --git a/views/statistics.handlebars b/views/statistics.handlebars
index e200cf38..1737eef9 100644
--- a/views/statistics.handlebars
+++ b/views/statistics.handlebars
@@ -1,6 +1,6 @@
 
 	<div class="top-bar">
-		{{> topBar}}
+		{{> navBar}}
 	</div>
 	<div>
 		<h3>Site Statistics</h3>