diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee
index cfb728e9..d2037b90 100644
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@@ -444,6 +444,10 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading) ->
     """
 
     link = ($scope, $el, $attrs, $model) ->
+
+        isEditable = ->
+            return $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1
+
         save = ->
             $model.$modelValue.subject = $scope.item.subject
             $loading.start($el.find('.save-container'))
@@ -451,25 +455,17 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading) ->
             promise.then ->
                 $confirm.notify("success")
                 $rootscope.$broadcast("history:reload")
-                $el.find('div.edit-subject').hide()
-                $el.find('div.view-subject').show()
+                $el.find('.edit-subject').hide()
+                $el.find('.view-subject').show()
             promise.then null, ->
                 $confirm.notify("error")
             promise.finally ->
                 $loading.finish($el.find('.save-container'))
 
-        $scope.$watch $attrs.ngModel, (value) ->
-            return if not value
-            $scope.item = value
-            if $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1
-                $el.find('div.view-subject span.edit').show()
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
         $el.click ->
-            $el.find('div.edit-subject').show()
-            $el.find('div.view-subject').hide()
+            return if not isEditable()
+            $el.find('.edit-subject').show()
+            $el.find('.view-subject').hide()
             $el.find('input').focus()
 
         $el.on "click", ".save", ->
@@ -486,6 +482,18 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading) ->
         $el.find('div.edit-subject').hide()
         $el.find('div.view-subject span.edit').hide()
 
+
+        $scope.$watch $attrs.ngModel, (value) ->
+            return if not value
+            $scope.item = value
+
+            if not isEditable()
+                $el.find('.view-subject .edit').remove()
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+
     return {
         link: link
         restrict: "EA"
@@ -517,12 +525,12 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading)
     """ # TODO: i18n
     noDescriptionMegEditMode = """
     <p class="no-description">
-        -- no description yet, why don't you add a good one clicking here? --
+        No description yet, why don't you add a good one clicking here?
     </p>
     """ # TODO: i18n
     noDescriptionMegReadMode = """
     <p class="no-description">
-        -- no description yet --
+        No description
     </p>
     """ # TODO: i18n
 
@@ -536,6 +544,7 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading)
         $el.on "click", ".view-description", (event) ->
             # We want to dettect the a inside the div so we use the target and
             # not the currentTarget
+            return if not isEditable()
             target = angular.element(event.target)
             if not target.is('a')
                 $el.find('div.edit-description').show()
@@ -567,9 +576,10 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading)
             return if not value
             $scope.item = value
 
-            if isEditable
+            if isEditable()
                 $el.find('div.view-description span.edit').show()
                 $scope.noDescriptionMsg = noDescriptionMegEditMode
+                $el.find('.view-description p').addClass('editable')
             else
                 $scope.noDescriptionMsg = noDescriptionMegReadMode
 
diff --git a/app/styles/components/tag.scss b/app/styles/components/tag.scss
index 4a38108c..7c52dd35 100644
--- a/app/styles/components/tag.scss
+++ b/app/styles/components/tag.scss
@@ -43,6 +43,7 @@
     }
     .add-tag {
         color: $gray-light;
+        vertical-align: initial;
         &:hover {
             color: $fresh-taiga;
         }
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index 0d959c75..f8185a01 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -152,22 +152,27 @@
 .duty-content {
     position: relative;
     &:hover {
-        cursor: pointer;
         .view-description {
             .edit {
                 @include transition(all .2s linear);
                 opacity: 1;
                 top: -1.5rem;
             }
-            p {
-                @include transition(background .2s linear);
+            .no-description {
+                color: $grayer;
+            }
+            .editable {
                 background: $whitish;
+                cursor: pointer;
             }
         }
     }
     &.wysiwyg {
         overflow: visible;
     }
+    .no-description {
+        color: $gray-light;
+    }
     textarea {
         background: $white;
         height: 10rem;