diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index 11d4d4dd5..ecad34803 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -462,3 +462,37 @@ div[data-template=flow] {
     display : none;
   }
 }
+
+
+#top-right-nav {
+  z-index: 10;
+  position : absolute;
+  right : 10px;
+  top : 10px;
+
+
+  .label {
+    padding : 2px 5px;
+    padding-right : 7px;
+    padding-bottom : 3px;
+
+    span {
+      display : inline-block;
+      position : relative;
+      top : 1px;
+      font-family : Roboto-Bold;
+    }
+  }
+
+  & > a {
+    @include transition(opacity);
+    @include opacity(0.4);
+
+    margin-left : 5px;
+
+    &:hover {
+      @include opacity(0.75);
+      text-decoration : none;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index ea0ffd602..d3ac70e40 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -57,34 +57,6 @@
   }
 }
 
-#home-button {
-  @include transition(opacity);
-  @include opacity(0.4);
-
-  z-index: 10;
-  position : absolute;
-  right : 10px;
-  top : 10px;
-
-  .label {
-    padding : 2px 5px;
-    padding-right : 7px;
-    padding-bottom : 3px;
-
-    span {
-      display : inline-block;
-      position : relative;
-      top : 1px;
-      font-family : Roboto-Bold;
-    }
-  }
-
-  &:hover {
-    @include opacity(0.75);
-    text-decoration : none;
-  }
-}
-
 #profile-stats {
   i {
     @include transition(opacity);
diff --git a/app/assets/templates/post-viewer.jst.hbs b/app/assets/templates/post-viewer.jst.hbs
index a34e1a3e3..1893c839a 100644
--- a/app/assets/templates/post-viewer.jst.hbs
+++ b/app/assets/templates/post-viewer.jst.hbs
@@ -4,14 +4,16 @@
   <div id="header-container"> </div>
 </div>
 
-<a href="/" id="home-button">
-    <span class="label label-inverse">
-        <i class="icon-home icon-white"></i>
-        <span>
-            HOME
+<div id="top-right-nav">
+    <a href="/" id="home-button">
+        <span class="label label-inverse">
+            <i class="icon-home icon-white"></i>
+            <span>
+                HOME
+            </span>
         </span>
-    </span>
-</a>
+    </a>
+</div>
 
 <div id="post-content"> </div>
 <div id="post-nav"> </div>
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index a066fd645..9ee9bf424 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -1,11 +1,26 @@
-<a href="/" id="home-button">
-    <span class="label label-inverse">
-        <i class="icon-home icon-white"></i>
-        <span>
-            HOME
+<div id="top-right-nav">
+
+    {{#unless isOwnProfile}}
+        <a href="#" onClick="alert('Not yet implemented!')" id="follow-button">
+            <span class="label label-inverse">
+                <i class="icon-plus icon-white"></i>
+                <span>
+                    FOLLOW
+                </span>
+            </span>
+        </a>
+    {{/unless}}
+
+    <a href="/" id="home-button">
+        <span class="label label-inverse">
+            <i class="icon-home icon-white"></i>
+            <span>
+                HOME
+            </span>
         </span>
-    </span>
-</a>
+    </a>
+</div>
+
 
 <section id="profile-info"/>