diff --git a/app/modules/epics/create-epic/create-epic.controller.coffee b/app/modules/epics/create-epic/create-epic.controller.coffee
index ea0f1b3e..c80ef89c 100644
--- a/app/modules/epics/create-epic/create-epic.controller.coffee
+++ b/app/modules/epics/create-epic/create-epic.controller.coffee
@@ -21,18 +21,15 @@ module = angular.module("taigaEpics")
 
 class CreateEpicController
     @.$inject = [
-        "tgResources",
-        "$tgConfirm",
+        "tgResources"
     ]
 
-    constructor: (@rs, @confirm) ->
+    constructor: (@rs) ->
         @.attachments = Immutable.List()
 
     createEpic: () ->
         @.newEpic.project = @.project.id
         return @rs.epics.post(@.newEpic).then () =>
-            @confirm.notify("success")
             @.onReloadEpics()
 
-
 module.controller("CreateEpicCtrl", CreateEpicController)
diff --git a/app/modules/epics/dashboard/epics-dashboard.controller.coffee b/app/modules/epics/dashboard/epics-dashboard.controller.coffee
index 90066000..1c9d8b6e 100644
--- a/app/modules/epics/dashboard/epics-dashboard.controller.coffee
+++ b/app/modules/epics/dashboard/epics-dashboard.controller.coffee
@@ -26,9 +26,11 @@ class EpicsDashboardController
         "$routeParams",
         "tgErrorHandlingService",
         "tgLightboxFactory",
+        "lightboxService",
+        "$tgConfirm"
     ]
 
-    constructor: (@rs, @resources, @params, @errorHandlingService, @lightboxFactory) ->
+    constructor: (@rs, @resources, @params, @errorHandlingService, @lightboxFactory, @lightboxService, @confirm) ->
         @.sectionName = "Epics"
         @._loadProject()
         @.createEpic = false
@@ -45,14 +47,19 @@ class EpicsDashboardController
         return @resources.epics.list(projectId).then (epics) =>
             @.epics = epics
 
+    _onCreateEpic: () ->
+        @lightboxService.closeAll()
+        @confirm.notify("success")
+        @._loadEpics()
+
     onCreateEpic: () ->
         @lightboxFactory.create('tg-create-epic', {
-            "class": "lightbox lightbox-create-epic"
+            "class": "lightbox lightbox-create-epic open"
             "project": "project"
-            "on-reload-epics": "onReloadEpics"
+            "on-reload-epics": "reloadEpics()"
         }, {
             "project": @.project
-            "onReloadEpics": @_loadEpics
+            "reloadEpics": @._onCreateEpic.bind(this)
         })
 
 module.controller("EpicsDashboardCtrl", EpicsDashboardController)
diff --git a/app/modules/epics/dashboard/story-row/story-row.jade b/app/modules/epics/dashboard/story-row/story-row.jade
index fefac319..9c8c513a 100644
--- a/app/modules/epics/dashboard/story-row/story-row.jade
+++ b/app/modules/epics/dashboard/story-row/story-row.jade
@@ -1,9 +1,6 @@
 .story-row(
     ng-class="{'is-blocked': vm.story.is_blocked, 'is-closed': vm.story.is_closed}"
 )
-    tg-svg.icon-drag(
-        svg-icon="icon-drag"
-    )
     .vote(
         ng-if="vm.column.votes"
         ng-class="{'is-voter': vm.story.get('is_voter')}"
diff --git a/app/modules/epics/dashboard/story-row/story-row.scss b/app/modules/epics/dashboard/story-row/story-row.scss
index 320e93f0..4eaf597e 100644
--- a/app/modules/epics/dashboard/story-row/story-row.scss
+++ b/app/modules/epics/dashboard/story-row/story-row.scss
@@ -8,13 +8,10 @@
     border-bottom: 1px solid $whitish;
     cursor: pointer;
     display: flex;
-    margin-left: 5rem;
+    margin-left: 4rem;
     transition: background .2s;
     &:hover {
         background: rgba($primary-light, .05);
-        .icon-drag {
-            opacity: 1;
-        }
     }
     &.is-blocked {
         background: rgba($red-light, .5);
@@ -25,15 +22,8 @@
             text-decoration: line-through;
         }
     }
-    .icon-drag {
-        @include svg-size(.75rem);
-        cursor: move;
-        fill: $whitish;
-        opacity: 0;
-        transition: opacity .1s;
-    }
     .name {
-        flex-basis: 16vw;
+        flex-basis: 17.5vw;
     }
     .story-pill-wrapper {
         display: inline-block;