diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 73be76ee..c01814af 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -5,7 +5,7 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories|orderBy:order track by u
             input(tg-check-permission, permission="modify_us", type="checkbox", name="")
             a.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
                         title="{{ us.subject }}", tg-bo-bind="us.subject")
-            span.us-settings
+            div.us-settings
                 a.icon.icon-edit(tg-check-permission, permission="modify_us", href="",
                                  ng-click="ctrl.editUserStory(us)", title="Edit")
                 a.icon.icon-delete(tg-check-permission, permission="delete_us", href="",
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 6fccedc3..98b1602e 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -8,9 +8,9 @@
         }
     }
     .row {
-        @include table-flex();
         @extend %small;
         border-bottom: 1px solid $gray-light;
+        display: flex;
         padding: .5rem 0 .5rem .5rem;
         text-align: left;
         width: 100%;
@@ -22,14 +22,33 @@
         &:hover {
             background: transparent;
         }
+        .user-story-name {
+            display: flex;
+            justify-content: space-between;
+            input,
+            .us-settings {
+                flex-shrink: 0;
+                white-space: nowrap;
+            }
+            a {
+                width: 100%;
+            }
+        }
         .user-stories {
-            @include table-flex-child(20, 100px, 0, 0);
+            width: 100%;
         }
         .status {
-            @include table-flex-child(2, 150px, 0, 0);
+            flex-shrink: 0;
+            width: 240px;
         }
         .points {
-            @include table-flex-child(1, 80px, 0, 0);
+            flex-shrink: 0;
+            width: 125px;
+        }
+        .icon-edit,
+        .icon-delete {
+            display: inline;
+            float: none;
         }
     }
     .status,
@@ -205,7 +224,7 @@
     }
     .us-settings {
         float: right;
-        margin-right: 2rem;
+        margin: 0 2rem;
         opacity: 0;
     }
     .icon-drag-v {