diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index c8bfa64d..1b8e8355 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -112,9 +112,9 @@ WatchersDirective = ($rootscope, $confirm) ->
             </a>
         </div>
         <div class="watcher-name">
-            <a href="" title="<%- watcher.full_name_display %>">
+            <span>
                 <%- watcher.full_name_display %>
-            </a>
+            </span>
 
             <% if (editable) { %>
             <a class="icon icon-delete"
@@ -190,15 +190,14 @@ AssignedToDirective = ($rootscope, $confirm) ->
     template = _.template("""
     <% if (assignedTo) { %>
     <div class="user-avatar">
-        <a href="" title="Assigned to" class="avatar">
-            <img src="<%= assignedTo.photo %>" alt="<%- assignedTo.full_name_display %>" />
-        </a>
+        <img src="<%= assignedTo.photo %>" alt="<%- assignedTo.full_name_display %>" />
     </div>
     <% } %>
 
     <div class="assigned-to">
         <span class="assigned-title">Assigned to</span>
-        <a href="" title="edit assignment" class="user-assigned">
+
+        <a href="" title="edit assignment" class="user-assigned <% if (editable) { %> editable <% } %>">
         <% if (assignedTo) { %>
             <%- assignedTo.full_name_display %>
         <% } else { %>
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 4fe985fc..6815eeac 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -22,7 +22,7 @@ block content
 
                 div.blocked-warning(ng-show="us.is_blocked")
                     span.icon.icon-warning
-                    p.blocked Blocked!
+                    p.blocked Trolrororo!
                     p(tg-bind-html="us.blocked_note || 'This user story is blocked'")
 
                 div.user-story-tags(tg-tag-line, ng-model="us.tags")
diff --git a/app/styles/components/assigned-to.scss b/app/styles/components/assigned-to.scss
index e38d62c6..63f8e8f2 100644
--- a/app/styles/components/assigned-to.scss
+++ b/app/styles/components/assigned-to.scss
@@ -4,18 +4,27 @@
     position: relative;
     .user-avatar {
         @include table-flex-child(1, 0);
+        img {
+            border-radius: 8%;
+            width: 100%;
+        }
     }
     .assigned-to {
         @include table-flex-child(3, 0);
         margin-left: 1rem;
         margin-top: 15px;
         .assigned-title {
+            @extend %small;
             color: $gray-light;
             display: block;
         }
         .user-assigned {
             @extend %large;
             color: $green-taiga;
+            cursor: default;
+            &.editable {
+                cursor: pointer;
+            }
         }
         .icon-delete {
             color: $gray-light;
diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index 121465ef..a7beec48 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -42,7 +42,7 @@ a.button-green {
     }
 }
 
-.button-gray {
+a.button-gray {
     background: $button-gray;
     &:hover {
         background: $button-gray-hover;
@@ -53,7 +53,7 @@ a.button-green {
     }
 }
 
-.button-blackish {
+a.button-blackish {
     background: $blackish;
     color: $whitish;
     &:hover {
@@ -65,7 +65,7 @@ a.button-green {
     }
 }
 
-.button-red {
+a.button-red {
     background: $red-light;
     &:hover {
         background: $red;
@@ -76,7 +76,7 @@ a.button-green {
     }
 }
 
-.button-orange {
+a.button-orange {
     background: $orange;
     &:hover {
         background: lighten($orange, 10%);
@@ -87,7 +87,7 @@ a.button-green {
     }
 }
 
-.button-block {
+a.button-block {
     background: $white;
     color: $red;
     &:hover {
@@ -96,7 +96,7 @@ a.button-green {
     }
 }
 
-.button-bulk {
+a.button-bulk {
     @extend %button;
     background: $green-taiga;
     font-size: 22px;
diff --git a/app/styles/components/watchers.scss b/app/styles/components/watchers.scss
index af03cf9d..63afee95 100644
--- a/app/styles/components/watchers.scss
+++ b/app/styles/components/watchers.scss
@@ -37,7 +37,7 @@
     }
     .watcher-name {
         @include table-flex-child(8, 0);
-        @extend %medium;
+        @extend %small;
         color: $grayer;
         margin-left: 1rem;
         position: relative;
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index 2040441c..59ddbf48 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -17,6 +17,9 @@
         margin-bottom: 1rem;
         padding: 2rem 1rem;
         position: relative;
+        input {
+            background: $white;
+        }
         .us-title-text {
             margin-bottom: 0;
         }
@@ -76,6 +79,9 @@
 }
 
 .us-content {
+    textarea {
+        background: $white;
+    }
     ul {
         margin-left: 1rem;
     }
@@ -98,10 +104,12 @@
     }
     input {
         display: inline-block;
+        padding: .4rem;
         width: 14rem;
     }
     .tag {
-        padding: 2px 10px;
+        @extend %small;
+        padding: .5rem;
     }
 }
 
@@ -201,12 +209,14 @@
 }
 
 .issue-data {
+    @extend %small;
     div {
         @include clearfix();
         @include transition(background .2s ease-in);
         background: darken($whitish, 5%);
         margin-bottom: .5rem;
         padding: .5rem;
+        padding-right: 1rem;
         &:last-child {
             margin: 0;
         }
diff --git a/app/styles/modules/common/attachments.scss b/app/styles/modules/common/attachments.scss
index 980e830b..6581f9dd 100644
--- a/app/styles/modules/common/attachments.scss
+++ b/app/styles/modules/common/attachments.scss
@@ -8,7 +8,6 @@
     padding: .5rem 1rem;
     .button {
         float: right;
-        padding: .2rem 6rem;
     }
     .icon,
     .attachments-num,