diff --git a/app/partials/kanban.jade b/app/partials/kanban.jade
index cea0206e..4021c31c 100644
--- a/app/partials/kanban.jade
+++ b/app/partials/kanban.jade
@@ -22,7 +22,7 @@ block content
             //-include views/modules/list-filters-kanban
             include views/modules/kanban-table
 
-        div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory)
+        div.lightbox.lightbox-generic-form(tg-lb-create-edit-userstory)
             include views/modules/lightbox-us-create-edit
 
         div.lightbox.lightbox-generic-bulk(tg-lb-create-bulk-userstories)
diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade
index 55012439..9b02859d 100644
--- a/app/partials/views/components/kanban-task.jade
+++ b/app/partials/views/components/kanban-task.jade
@@ -6,8 +6,33 @@ div.kanban-task-inner
         span.task-num(tg-bo-ref="us.ref")
         a.task-name(href="", tg-bo-title="us.subject", tg-bind-html="us.subject",
                     tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")
-        a.task-points(href="", title="Total Us points")
-            span(tg-bind-html="us.total_points") --
-            span points
+        ul.task-points-per-role
+            li
+                a(href="", title="Role Points")
+                    span User Experience
+                    span(tg-bind-html="us.total_points") --
+                    span points
+                    span.icon.icon-arrow-bottom
+            li
+                a(href="", title="Role Points")
+                    span Design
+                    span(tg-bind-html="us.total_points") --
+                    span points
+                    span.icon.icon-arrow-bottom
+            li
+                a(href="", title="Role Points")
+                    span Front
+                    span(tg-bind-html="us.total_points") --
+                    span points
+                    span.icon.icon-arrow-bottom
+            li
+                a(href="", title="Role Points")
+                    span Back
+                    span(tg-bind-html="us.total_points") --
+                    span points
+                    span.icon.icon-arrow-bottom
+        //-p.task-points
+        //-    span(tg-bind-html="us.total_points") --
+        //-    span points
     a.icon.icon-edit(tg-check-permission="modify_us", href="", title="Edit")
     a.icon.icon-drag-h(tg-check-permission="modify_us", href="", title="Drag&Drop")
diff --git a/app/partials/views/modules/lightbox-us-create-edit.jade b/app/partials/views/modules/lightbox-us-create-edit.jade
index 377a068d..ab8024fa 100644
--- a/app/partials/views/modules/lightbox-us-create-edit.jade
+++ b/app/partials/views/modules/lightbox-us-create-edit.jade
@@ -5,25 +5,9 @@ form
     fieldset
         input(type="text", name="subject", ng-model="us.subject", tg-i18n="placeholder:common.subject",
               data-required="true", data-maxlength="500")
-    // Add estimation points
-    fieldset.estimation
-        ul.points-per-role
-            li.total
-                span.points 40
-                span.role UX
-            li.total
-                span.points 30
-                span.role Front
-            li.total
-                span.points 20
-                span.role Design
-            li.total
-                span.points 10
-                span.role Back
-    // Remove status input
-    //-fieldset
-    //-    select(name="status", ng-model="us.status", ng-options="s.id as s.name for s in usStatusList",
-    //-           tg-i18n="placeholder:common.status")
+    fieldset
+        select(name="status", ng-model="us.status", ng-options="s.id as s.name for s in usStatusList",
+               tg-i18n="placeholder:common.status")
     fieldset
         div(tg-tag-line, editable="true", ng-model="us.tags")
 
diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss
index ebe3c3b0..63e4c9af 100644
--- a/app/styles/components/kanban-task.scss
+++ b/app/styles/components/kanban-task.scss
@@ -115,14 +115,23 @@
         cursor: move;
         right: 45%;
     }
-    .task-points {
+    .task-points-per-role {
         @extend %small;
-        color: darken($postit-hover, 15%);
-        display: block;
         margin: 0;
+        a {
+            @include transition(color .2s linear);
+            color: darken($postit-hover, 15%);
+            &:hover {
+                @include transition(color .2s linear);
+                color: darken($postit-hover, 30%);
+            }
+        }
         span {
             display: inline-block;
+            padding-left: .2rem;
             &:first-child {
+                color: darken($postit-hover, 30%);
+                padding-left: 0;
                 padding-right: .2rem;
             }
         }
@@ -152,7 +161,7 @@
         white-space: nowrap;
         width: 70%;
     }
-    .task-points {
+    .task-points-per-role {
         display: none;
     }
     .icon-edit,
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index 2f309051..2f9f7809 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -147,10 +147,8 @@
 }
 
 .points-per-role {
-    @include table-flex();
     position: relative;
     > li {
-        @include table-flex-child(1, 18%, 0);
         @include transition(color .3s linear);
         border-right: 1px solid rgba($grayer, .3);
         color: rgba($grayer, .3);
@@ -158,13 +156,14 @@
         margin: .5rem .1rem;
         position: relative;
         text-align: center;
+        width: 18%;
         &.active {
             color: rgba($green-taiga, 1);
         }
         &:first-child {
             opacity: 1;
         }
-        &:last-child {
+        &:nth-child(5n) {
             border: 0;
         }
     }
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index e20c60b9..36df3683 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -505,12 +505,3 @@
         width: 600px;
     }
 }
-
-.lb-create-edit-userstory {
-    .points-per-role {
-        margin-bottom: 1rem;
-        li {
-            margin: .5rem .1rem;
-        }
-    }
-}