diff --git a/config/assets.yml b/config/assets.yml
index 337a5fd98..7b649a5ff 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -12,6 +12,7 @@ javascripts:
 
   templates:
     - public/javascripts/app/templates/*.handlebars
+    - public/javascripts/app/templates/**/*.handlebars
 
   main:
     - public/javascripts/vendor/underscore.js
diff --git a/public/javascripts/app/pages/post-viewer.js b/public/javascripts/app/pages/post-viewer.js
index 25284f120..c3871c12e 100644
--- a/public/javascripts/app/pages/post-viewer.js
+++ b/public/javascripts/app/pages/post-viewer.js
@@ -6,7 +6,6 @@ app.pages.PostViewer = app.views.Base.extend({
     "#post-content" : "postView",
     "#post-nav" : "navView",
     "#post-feedback" : "feedbackView"
-    // "#post-author" : "authorView"
   },
 
   postView : function(){
diff --git a/public/javascripts/app/templates/post-viewer-feedback.handlebars b/public/javascripts/app/templates/post-viewer/feedback.handlebars
similarity index 50%
rename from public/javascripts/app/templates/post-viewer-feedback.handlebars
rename to public/javascripts/app/templates/post-viewer/feedback.handlebars
index 929defc37..a84c287b1 100644
--- a/public/javascripts/app/templates/post-viewer-feedback.handlebars
+++ b/public/javascripts/app/templates/post-viewer/feedback.handlebars
@@ -1,17 +1,17 @@
 <div id="user-controls">
-  <a href="#" class="label">
+  <a href="#" class="label profile" title="{{current_user.name}}">
     <i class="icon-user icon-white"></i>
   </a>
-  <a href="#" class="label">
+  <a href="#" class="label like" title="Like">
     <i class="icon-heart icon-white"></i>
   </a>
-  <a href="#" class="label">
+  <a href="#" class="label follow" title="Follow Post">
     <i class="icon-plus icon-white"></i>
   </a>
-  <a href="#" class="label">
+  <a href="#" class="label reshare" title="Reshare">
     <i class="icon-retweet icon-white"></i>
   </a>
-  <a href="#" class="label">
+  <a href="#" class="label comment" title="Comment">
     <i class="icon-comment icon-white"></i>
   </a>
 </div>
diff --git a/public/javascripts/app/templates/post-viewer-nav.handlebars b/public/javascripts/app/templates/post-viewer/nav.handlebars
similarity index 100%
rename from public/javascripts/app/templates/post-viewer-nav.handlebars
rename to public/javascripts/app/templates/post-viewer/nav.handlebars
diff --git a/public/javascripts/app/views/post_feedback_view.js b/public/javascripts/app/views/post_feedback_view.js
index a4bce1a6d..a707e058a 100644
--- a/public/javascripts/app/views/post_feedback_view.js
+++ b/public/javascripts/app/views/post_feedback_view.js
@@ -1,6 +1,34 @@
 app.views.PostViewerFeedback = app.views.Base.extend({
 
-  templateName: "post-viewer-feedback"
+  templateName: "post-viewer/feedback",
+
+  events : {
+    "click .like" : "toggleLike",
+    "click .follow" : "toggleFollow",
+    "click .reshare" : "reshare",
+    "click .comment" : "comment"
+  },
+
+  tooltipSelector : ".label",
+
+  toggleLike : function(evt) {
+    if(evt) { evt.preventDefault(); }
+    this.model.toggleLike()
+  },
+
+  toggleFollow : function(evt) {
+    if(evt) { evt.preventDefault(); }
+    this.model.toggleFollow()
+  },
+
+  reshare : function(evt) {
+    if(evt) { evt.preventDefault(); }
+    this.model.reshare();
+  },
+
+  comment : function(){
+    alert('comment')
+  }
 
 })
 
diff --git a/public/javascripts/app/views/post_nav_view.js b/public/javascripts/app/views/post_nav_view.js
index 14a66c835..b17bb76c2 100644
--- a/public/javascripts/app/views/post_nav_view.js
+++ b/public/javascripts/app/views/post_nav_view.js
@@ -1,6 +1,6 @@
 app.views.PostViewerNav = app.views.Base.extend({
 
-  templateName: "post-viewer-nav",
+  templateName: "post-viewer/nav",
 
   postRenderTemplate : function() {
     var mappings = {"#forward" : "next_post",