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 0752ef40..ea4485ed 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
@@ -21,7 +21,12 @@ module = angular.module('taigaEpics')
 
 BelongToEpicsDirective = () ->
 
+    link = (scope, el, attrs) ->
+        if !scope.epics.isIterable
+          scope.epics = Immutable.fromJS(scope.epics)
+
     return {
+        link: link,
         templateUrl:"components/belong-to-epics/belong-to-epics.html",
         scope: {
             epics: '='
diff --git a/app/partials/includes/components/backlog-row.jade b/app/partials/includes/components/backlog-row.jade
index 0ed659b9..a569ad99 100644
--- a/app/partials/includes/components/backlog-row.jade
+++ b/app/partials/includes/components/backlog-row.jade
@@ -1,23 +1,23 @@
-div.row.us-item-row(
+.row.us-item-row(
     ng-repeat="us in userstories track by us.id"
     tg-bind-scope
     ng-class="{blocked: us.is_blocked}"
     tg-class-permission="{'readonly': '!modify_us'}"
 )
-    div.input(tg-check-permission="modify_us")
+    .input(tg-check-permission="modify_us")
         input(
           type="checkbox"
           name=""
         )
-    div.votes(
+    .votes(
         ng-class="{'inactive': !us.total_voters, 'is-voted': us.is_voter}"
         title="{{ 'COMMON.VOTE_BUTTON.COUNTER_TITLE'|translate:{total:us.total_voters||0}:'messageformat' }}"
     )
         tg-svg(svg-icon="icon-upvote")
         span {{ ::us.total_voters }}
-    div.user-stories
-        div.tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog")
-        div.user-story-name
+    .user-stories
+        .tags-block(tg-colorize-tags="us.tags", tg-colorize-tags-type="backlog")
+        .user-story-name
             a.clickable(
                 href=""
                 tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
@@ -26,7 +26,11 @@ div.row.us-item-row(
             )
                 span(tg-bo-ref="us.ref")
                 span(ng-bind="us.subject")
-            div.us-settings
+                tg-belong-to-epics(
+                    ng-if="us.epics"
+                    epics="us.epics"
+                )
+            .us-settings
                 a.e2e-edit.edit-story(
                     href=""
                     tg-check-permission="modify_us"
diff --git a/app/partials/includes/modules/sprint.jade b/app/partials/includes/modules/sprint.jade
index d66c5ca7..373ff370 100644
--- a/app/partials/includes/modules/sprint.jade
+++ b/app/partials/includes/modules/sprint.jade
@@ -19,6 +19,10 @@ div.sprint-table(tg-bind-scope, ng-class="{'sprint-empty-wrapper': !sprint.user_
                                 ng-class="{closed: us.is_closed, blocked: us.is_blocked}")
                 span(tg-bo-ref="us.ref")
                 span(tg-bo-bind="us.subject")
+                tg-belong-to-epics(
+                    ng-if="us.epics"
+                    epics="us.epics"
+                )
         div.column-points.width-1(tg-bo-bind="us.total_points",
                                   ng-class="{closed: us.is_closed, blocked: us.is_blocked}")
 
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 99f22b12..a7124d28 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -28,7 +28,7 @@
             flex-shrink: 0;
         }
         .user-stories {
-            overflow: hidden;
+            // overflow: hidden;
             width: 100%;
         }
         .status {
diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss
index ae95465b..82deb18a 100644
--- a/app/styles/modules/backlog/sprints.scss
+++ b/app/styles/modules/backlog/sprints.scss
@@ -47,14 +47,12 @@
         a {
             @include font-size(normal);
             @include font-type(text);
-            @include ellipsis($width: 90%);
             display: inline-block;
             margin-right: .5rem;
         }
     }
     .sprint {
         margin-bottom: 2rem;
-        overflow: hidden;
         header {
             position: relative;
         }
@@ -182,7 +180,6 @@
             padding: 0 4px;
         }
         .us-name {
-            @include ellipsis(230px);
             display: block;
             &.closed {
                 color: lighten($gray-light, 5%);