diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade
index 052cf64f..e1cfb80b 100644
--- a/app/partials/views/components/kanban-task.jade
+++ b/app/partials/views/components/kanban-task.jade
@@ -1,13 +1,13 @@
 div.kanban-tagline
     a.taskboard-tag
 div.kanban-task-inner
-    p.task-text
+    tg-kanban-user-avatar(model="us.assigned_to", click="ctrl.changeUsAssignedTo(us)")
+    div.task-text
         span.task-num(tg-bo-ref="us.ref")
         a.task-name(href="", title="", tg-bind-html="us.subject",
                     tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")
-
-    tg-kanban-user-avatar(model="us.assigned_to", click="ctrl.changeUsAssignedTo(us)")
-
+        p.task-points
+            span(tg-bind-html="us.total_points") --
+            span points
     a.icon.icon-edit(href="", title="Edit", ng-click="ctrl.editUserStory(us)")
     a.icon.icon-drag-h(href="", title="Drag&Drop")
-    a.task-points(href="", title="task points", tg-bind-html="us.total_points") --
diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss
index d7d9c89e..09d3eee3 100644
--- a/app/styles/components/kanban-task.scss
+++ b/app/styles/components/kanban-task.scss
@@ -21,34 +21,48 @@
         height: .3rem;
     }
     .kanban-task-inner {
+        @include table-flex();
         padding: 1rem 1rem 2rem;
     }
     .task-num {
         color: $postit-hover;
         margin-right: .5em;
     }
-    .task-text {
-        margin-bottom: .5rem;
-        padding-right: 2rem;
-    }
-    .assigned-to {
-        @extend %small;
-    }
     .avatar {
-        display: inline-block;
-        vertical-align: middle;
+        @include table-flex-child($flex-basis: 50px);
+        a {
+            @extend %small;
+            text-align: center;
+        }
         img {
-            margin-right: .5rem;
-            max-width: 1.5rem;
+            margin: 0 auto;
+        }
+        .assigned-to {
+            color: darken($postit-hover, 15%);
+            display: block;
+            overflow: hidden;
+            position: relative;
+            text-overflow: ellipsis;
+            top: 4px;
+            white-space: nowrap;
+            width: 50px;
         }
     }
+    .task-text {
+        @include table-flex-child($flex-grow: 10, $flex-basis: 50px);
+        @extend %small;
+        padding: 0 .5rem 0 1rem;
+    }
     .task-points {
-        @extend %large;
-        color: $postit-hover;
-        padding: .5rem 1rem;
-        position: absolute;
-        right: 0;
-        top: .5rem;
+        @extend %small;
+        color: darken($postit-hover, 15%);
+        margin: 0;
+        span {
+            display: inline-block;
+            &:first-child {
+                padding-right: .2rem;
+            }
+        }
     }
     .icon-edit,
     .icon-drag-h {
diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss
index c4226c37..0808cab4 100644
--- a/app/styles/modules/backlog/taskboard-table.scss
+++ b/app/styles/modules/backlog/taskboard-table.scss
@@ -97,54 +97,57 @@ $column-margin: 0 10px 0 0;
     .points-value {
         @extend %small;
         color: $gray-light;
-    }
-    /*
-    .us-ref {
-        color: $gray;
-        margin-right: .5rem;
-    }
-    .status {
-        color: $green-taiga;
-        margin-bottom: .5rem;
-        position: relative;
-        .icon {
-            @include transition (opacity .2s linear);
-            opacity: 0;
-        }
-        &:hover {
-            .icon {
-                @include transition (opacity .2s linear);
-                opacity: 1;
-            }
+        span {
+            margin-right: .1rem;
         }
     }
-    .pop-status {
-        @include popover(150px, 20px, 30px, '', '');
-    }
-    .pop-points {
-        @include popover(200px, 125px, 30px, '', '');
-        li {
-            display: inline-block;
-            width: 23%;
-        }
-        a {
-            display: block;
-            text-align: center;
-            &:hover,
-            &.active {
-                background: $fresh-taiga;
-                color: $white;
-            }
-        }
-    }
-    .new-task {
-        margin-top: 3rem;
-        opacity: 0;
-    }
-    .button-green {
-        padding: 7px 80px;
-    }
-    */
+
+//    .us-ref {
+//        color: $gray;
+//        margin-right: .5rem;
+//    }
+//    .status {
+//        color: $green-taiga;
+//        margin-bottom: .5rem;
+//        position: relative;
+//        .icon {
+//            @include transition (opacity .2s linear);
+//            opacity: 0;
+//        }
+//        &:hover {
+//            .icon {
+//                @include transition (opacity .2s linear);
+//                opacity: 1;
+//            }
+//        }
+//    }
+//    .pop-status {
+//        @include popover(150px, 20px, 30px, '', '');
+//    }
+//    .pop-points {
+//        @include popover(200px, 125px, 30px, '', '');
+//        li {
+//            display: inline-block;
+//            width: 23%;
+//        }
+//        a {
+//            display: block;
+//            text-align: center;
+//            &:hover,
+//            &.active {
+//                background: $fresh-taiga;
+//                color: $white;
+//            }
+//        }
+//    }
+//    .new-task {
+//        margin-top: 3rem;
+//        opacity: 0;
+//    }
+//    .button-green {
+//        padding: 7px 80px;
+//    }
+
 }
 
 .points-list {