diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index d003fe38..19ffe3c9 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -17,21 +17,11 @@ block content
                     h2.us-title-text
                         span.us-number(tg-bo-ref="issue.ref")
                         span.us-name(ng-bind="issue.subject")
-                    //- TODO: FIX ME
-                    h3.us-related-task(ng-if="issue.generated_user_stories")
-                        | From this issue have been generated the user stories
-                        //- a(tg-check-permission="view_us", href="", title="Go to user story",
-                        //- tg-nav="project-userstories-detail:project=project.slug, ref=us.ref",
-                        //- ng-if="us")
-                        //-     span(tg-bo-ref="us.ref")
-                        //-     span(tg-bo-bind="us.subject")
-                        ul
-                            li(ng-repeat="us in issue.generated_user_stories")
-                                a(tg-check-permission="view_us", href="", title="Go to user story",
-                                  tg-nav="project-userstories-detail:project=project.slug, ref=us.ref")
-                                    span(tg-bo-ref="us.ref")
-                                    span(tg-bo-bind="us.subject")
-                    //- END TODO
+
+                    p.us-related-task(ng-if="issue.generated_user_stories") This issue has been promoted to US:
+                        a(ng-repeat="us in issue.generated_user_stories", tg-check-permission="view_us", href="",
+                          tg-bo-title="us.subject", tg-nav="project-userstories-detail:project=project.slug, ref=us.ref")
+                              span(tg-bo-ref="us.ref")
 
                     p.block-desc-container(ng-show="issue.is_blocked")
                         span.block-description-title Blocked
@@ -54,9 +44,8 @@ block content
             section.watchers(tg-watchers, ng-model="issue")
 
             section.us-detail-settings
-                a.button.button-green.clickable(tg-check-permission="add_us", ng-click="ctrl.promoteToUs()",
-                                                href="")
-                    Promote to User Story
+                a.button.button-gray.clickable(tg-check-permission="add_us",
+                                                ng-click="ctrl.promoteToUs()", href="") Promote to User Story
 
         div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory)
             include views/modules/lightbox-us-create-edit
diff --git a/app/partials/issues.jade b/app/partials/issues.jade
index 4b3552d7..a233c230 100644
--- a/app/partials/issues.jade
+++ b/app/partials/issues.jade
@@ -15,7 +15,7 @@ block content
             include views/modules/list-filters
             include views/modules/issues-table
 
-            // Paginator is rended using js.
+            // Paginator is rendered using js.
             div.paginator.issues-paginator
 
         div.lightbox.lightbox-select-user(tg-lb-assignedto)
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index 85dae2a5..98bebef4 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -17,8 +17,16 @@
                 margin-bottom: .5rem;
             }
             .us-number,
-            .us-name {
+            .us-name,
+            .us-related-task {
                 color: $white;
+                a {
+                    @include transition(color .3s linear);
+                    color: $white;
+                    &:hover {
+                        color: $red-light;
+                    }
+                }
             }
             .unblock {
                 @extend %bold;
@@ -35,6 +43,9 @@
                 }
             }
         }
+        p {
+            margin-bottom: 0;
+        }
         .us-edit-name-inner {
             @include table-flex();
         }
@@ -68,16 +79,18 @@
             margin-top: .5rem;
             a {
                 @include transition(color .3s linear);
-                color: lighten($grayer, 30%);
-                margin-left: .2rem;
+                border-left: 1px solid $gray-light;
+                padding: 0 .2rem;
                 &:hover {
                     color: $green-taiga;
                 }
+                &:first-child {
+                    border: 0;
+                }
             }
         }
         .block-desc-container {
             @extend %small;
-            margin: 0 0 1.2rem;
         }
         .block-description-title {
             @extend %bold;