diff --git a/app/modules/components/belong-to-epics/belong-to-epics.directive.coffee b/app/modules/components/belong-to-epics/belong-to-epics.directive.coffee
index 455adc1d..1e7d8fa7 100644
--- a/app/modules/components/belong-to-epics/belong-to-epics.directive.coffee
+++ b/app/modules/components/belong-to-epics/belong-to-epics.directive.coffee
@@ -29,7 +29,9 @@ BelongToEpicsDirective = () ->
           scope.project = Immutable.fromJS(scope.project)
 
         scope.getTemplateUrl = () ->
-            return "components/belong-to-epics/belong-to-epics-" + attrs.format + ".html"
+            if attrs.format
+                return "components/belong-to-epics/belong-to-epics-" + attrs.format + ".html"
+            return "components/belong-to-epics/belong-to-epics-pill.html"
 
     return {
         link: link,
diff --git a/app/modules/components/detail/header/detail-header.directive.coffee b/app/modules/components/detail/header/detail-header.directive.coffee
index 81f0f9a4..10267d0f 100644
--- a/app/modules/components/detail/header/detail-header.directive.coffee
+++ b/app/modules/components/detail/header/detail-header.directive.coffee
@@ -36,7 +36,7 @@ DetailHeaderDirective = () ->
             requiredPerm: "@"
         },
         controllerAs: "vm",
-        templateUrl:"stories/header/story-header.html"
+        templateUrl:"components/detail/header/detail-header.html"
     }
 
 
diff --git a/app/partials/issue/issues-detail.jade b/app/partials/issue/issues-detail.jade
index 771cf4fd..e85c9a3d 100644
--- a/app/partials/issue/issues-detail.jade
+++ b/app/partials/issue/issues-detail.jade
@@ -23,6 +23,7 @@ div.wrapper(
                     required-perm="modify_issue"
                     ng-class="{blocked: issue.is_blocked}"
                     ng-if="project && issue"
+                    format="text"
                 )
             .subheader
                 tg-tag-line.tags-block(
diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade
index 59b6e4be..2a331a5b 100644
--- a/app/partials/task/task-detail.jade
+++ b/app/partials/task/task-detail.jade
@@ -32,65 +32,8 @@ div.wrapper(
                     required-perm="modify_task"
                     ng-class="{blocked: task.is_blocked}"
                     ng-if="project && task"
+                    type="text"
                 )
-                //- h3.us-related-task(ng-if="us")
-                //-         | {{ 'TASK.OWNER_US'|translate }}
-                //-         a(
-                //-             href=""
-                //-             tg-check-permission="view_us"
-                //-             tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
-                //-             title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}"
-                //-         )
-                //-             span(tg-bo-ref="us.ref")
-                //-             span(tg-bo-bind="us.subject")
-                //- div.us-title(ng-class="{blocked: task.is_blocked}")
-                //-     h2.us-title-text
-                //-         span.us-number(tg-bo-ref="task.ref")
-                //-         span.us-name(
-                //-             tg-editable-subject
-                //-             ng-model="task"
-                //-             required-perm="modify_task"
-                //-         )
-                //-
-                //-     h3.us-related-task(ng-if="us")
-                //-         | {{ 'TASK.OWNER_US'|translate }}
-                //-         a(
-                //-             href=""
-                //-             tg-check-permission="view_us"
-                //-             tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
-                //-             title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}"
-                //-         )
-                //-             span(tg-bo-ref="us.ref")
-                //-             span(tg-bo-bind="us.subject")
-                //-
-                //-     p.external-reference(ng-if="task.external_reference")
-                //-         a(
-                //-             tg-bo-href="task.external_reference[1]",
-                //-             target="_blank"
-                //-             title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}"
-                //-         )
-                //-             | {{ "TASK.ORIGIN_US"| translate }}
-                //-             span {{ task.external_reference[1] }}
-                //-
-                //-     p.block-desc-container(ng-show="task.is_blocked")
-                //-         span.block-description-title(translate="COMMON.BLOCKED")
-                //-         span.block-description(
-                //-             ng-bind="task.blocked_note || ('TASK.BLOCKED_DESCRIPTION' | translate)"
-                //-         )
-                //-
-                //-     div.issue-nav
-                //-         a(
-                //-             ng-show="previousUrl"
-                //-             tg-bo-href="previousUrl"
-                //-             title="{{'TASK.PREVIOUS' | translate}}"
-                //-         )
-                //-             tg-svg(svg-icon="icon-arrow-left")
-                //-         a(
-                //-             ng-show="nextUrl"
-                //-             tg-bo-href="nextUrl"
-                //-             title="{{'TASK.NEXT' | translate}}"
-                //-         )
-                //-             tg-svg(svg-icon="icon-arrow-right")
             .subheader
                 tg-tag-line.tags-block(
                     ng-if="task && project"
diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade
index b35b512d..6c04fb9f 100644
--- a/app/partials/us/us-detail.jade
+++ b/app/partials/us/us-detail.jade
@@ -32,6 +32,7 @@ div.wrapper(
                     required-perm="modify_us"
                     ng-class="{blocked: us.is_blocked}"
                     ng-if="project && us"
+                    type="text"
                 )
             .subheader
                 tg-tag-line.tags-block(