diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js
index 33c9f88f65feae60ee5a22e06e5b98a07966c08e..02b353d24eff6e0cc32b73ba29263add9fd7eac4 100644
--- a/app/assets/javascripts/app/pages/profile.js
+++ b/app/assets/javascripts/app/pages/profile.js
@@ -15,6 +15,8 @@ app.pages.Profile = app.views.Base.extend({
     "click #edit-mode-toggle" : "toggleEdit"
   },
 
+  tooltipSelector : "*[rel=tooltip]",
+
   personGUID : null,
   editMode : false,
 
diff --git a/app/assets/javascripts/app/views/profile_info_view.js b/app/assets/javascripts/app/views/profile_info_view.js
index 8fcc3bcedaabfed3a5191963574f4fb68bd49cfd..0b2fb9574647a0b0ca25f8285336265feab56289 100644
--- a/app/assets/javascripts/app/views/profile_info_view.js
+++ b/app/assets/javascripts/app/views/profile_info_view.js
@@ -1,6 +1,8 @@
 app.views.ProfileInfo = app.views.Base.extend({
   templateName : "profile-info",
 
+  tooltipSelector : "*[rel=tooltip]",
+
   initialize : function(){
     this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted
   }
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index b19c665bdd754159f2bb1dc59c0e56e9235b741e..5f99bc2f1aa9a14e86b11a6cbd4ba02a55d003f0 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -147,15 +147,19 @@ body {
       width : 29px;
     }
 
+    .timestamp,
     .permalink {
-      cursor : pointer;
-      position : absolute;
-      right : 10px;
+      margin : 1px 7px;
+    }
+
+    .timestamp {
+      float : left;
       margin-top : 2px;
+    }
 
-      &:hover {
-        background-color : #ddd;
-      }
+    .permalink {
+      cursor : pointer;
+      float : right;
     }
   }
 
diff --git a/app/assets/templates/post-viewer.jst.hbs b/app/assets/templates/post-viewer.jst.hbs
index 5fddd6ef6bbaa564544c4fe6425b72a9e1940b4a..a34e1a3e3aa25d13ac78e8ea2e1f9b8c30115c80 100644
--- a/app/assets/templates/post-viewer.jst.hbs
+++ b/app/assets/templates/post-viewer.jst.hbs
@@ -13,7 +13,6 @@
     </span>
 </a>
 
-
 <div id="post-content"> </div>
 <div id="post-nav"> </div>
 <div id="post-interactions"> </div>
\ No newline at end of file
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index cdb6f3f3ce407575613a9400e90a39d17d8622aa..5b3aa27b4330613351699013860909921c391848 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -37,7 +37,7 @@
 
         {{#if isOwnProfile}}
             <span class="divider">•</span>
-            <a href="/profile/edit" title="Edit Profile" style="margin-left:2px;">
+            <a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;">
                 <i class="icon-cog"></i>
             </a>
         {{/if}}
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index 5aea788bb55e19f72c1aeb8dbf1b216bc155381d..a066fd645b398ebc9c17e0e6da7270c9b759d2b2 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -15,11 +15,11 @@
 
 <section id="profile-controls">
     {{#if isOwnProfile}}
-        <a href="#composer" title="New Post" class="control small" rel="facebox">
-            <img src='{{imageUrl "buttons/pub@2x.png"}}' />
+        <a href="#composer" class="control small" rel="facebox">
+            <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
         </a>
-        <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small">
-            <img src='{{imageUrl "buttons/edit@2x.png"}}' />
+        <a href="#" id="edit-mode-toggle" class="control small">
+            <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
         </a>
     {{/if}}
 </section>
diff --git a/app/assets/templates/small-frame.jst.hbs b/app/assets/templates/small-frame.jst.hbs
index ce5370e795ebc721c53534501c2f8f42cad47367..4ce198356b7060cf6c3b9fb84f45a947f9b44ce6 100644
--- a/app/assets/templates/small-frame.jst.hbs
+++ b/app/assets/templates/small-frame.jst.hbs
@@ -35,11 +35,13 @@
             {{/linkToPerson}}
         {{/if}}
 
+        <i class="icon-time timestamp" title="{{created_at}}" rel="tooltip"></i>
+        <i class="icon-share permalink" title="View Post" rel="tooltip"></i>
+
         <i class="icon-heart"></i> {{likes_count}}
         <i class="icon-retweet"></i> {{reshares_count}}
         <i class="icon-comment"></i> {{comments_count}}
 
-        <i class="icon-share permalink"></i>
     </div>
 </div>
 
diff --git a/spec/javascripts/app/pages/profile_spec.js b/spec/javascripts/app/pages/profile_spec.js
index 175ed7e78055246732542927a797920af2f4ae76..162dfa26b29a66ecd7213292a3e9cd0ab5e9c227 100644
--- a/spec/javascripts/app/pages/profile_spec.js
+++ b/spec/javascripts/app/pages/profile_spec.js
@@ -44,7 +44,7 @@ describe("app.pages.Profile", function(){
 //        will fix this in the next commit.
 //        spyOn(this.page, "isOwnProfile").andReturn(false)
 //        this.page.render()
-//        expect(this.page.$("#profile-controls .control").length).toBe(1)
+//        expect(this.page.$("#follow .control").length).toBe(1)
       })
     })