diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade
index ecfaa186..ad6b8ffc 100644
--- a/app/partials/backlog/backlog.jade
+++ b/app/partials/backlog/backlog.jade
@@ -53,7 +53,7 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
         div.empty-backlog(ng-class="{'hidden': userstories.length}", tg-backlog-empty-sortable)
             img(
                 src="/images/backlog-empty.png"
-                alt="{{'BACKLOG.EMPTY' | translate}}"    
+                alt="{{'BACKLOG.EMPTY' | translate}}"
             )
             p.title(translate="BACKLOG.EMPTY")
             a(href="", title="{{'BACKLOG.CREATE_NEW_US' | translate}}"
@@ -65,7 +65,7 @@ div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl",
     sidebar.menu-secondary.sidebar
         include ../includes/modules/sprints
 
-    div.lightbox.lightbox-generic-form(tg-lb-create-edit-userstory)
+    div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory)
         include ../includes/modules/lightbox-us-create-edit
 
     div.lightbox.lightbox-generic-bulk(tg-lb-create-bulk-userstories)
diff --git a/app/styles/components/estimation.scss b/app/styles/components/estimation.scss
index 340e7b11..3f50666d 100644
--- a/app/styles/components/estimation.scss
+++ b/app/styles/components/estimation.scss
@@ -2,6 +2,7 @@
     .points-per-role {
         display: flex;
         flex-wrap: wrap;
+        justify-content: center;
     }
     .ticket-role-points {
         background: rgba($gray-light, .1);
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 5e39f99e..7fe495ef 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -488,9 +488,15 @@
 
 .lb-create-edit-userstory {
     .ticket-role-points {
-        flex-basis: 10%;
         flex-grow: 1;
         flex-shrink: 1;
+        max-width: calc(100% * (1/5) - .2rem);
+        &:first-child {
+            margin-left: 0;
+        }
+        &:nth-child(5n+5) {
+            margin-right: 0;
+        }
     }
     .points-per-role {
         margin-bottom: 1rem;
diff --git a/app/styles/modules/common/ticket-data.scss b/app/styles/modules/common/ticket-data.scss
index 245ca8e1..a727f403 100644
--- a/app/styles/modules/common/ticket-data.scss
+++ b/app/styles/modules/common/ticket-data.scss
@@ -32,6 +32,7 @@
 
     .ticket-estimation {
         .ticket-role-points {
+            max-width: 25%;
             &:first-child {
                 flex-basis: 100%;
                 max-width: 100%;