diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee
index 3a2e41a5..5c67d529 100644
--- a/app/coffee/modules/backlog/lightboxes.coffee
+++ b/app/coffee/modules/backlog/lightboxes.coffee
@@ -24,142 +24,6 @@ bindOnce = @.taiga.bindOnce
 
 module = angular.module("taigaBacklog")
 
-#############################################################################
-## Create/Edit Userstory Lightbox Directive
-#############################################################################
-
-CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) ->
-    link = ($scope, $el, attrs) ->
-        isNew = true
-
-        $scope.$on "usform:new", ->
-            $scope.us = {
-                project: $scope.projectId
-                is_archived: false
-                status: $scope.project.default_us_status
-            }
-            isNew = true
-            # Update texts for creation
-            $el.find(".button-green span").html("Create") #TODO: i18n
-            $el.find(".title").html("New user story  ") #TODO: i18n
-            $el.removeClass("hidden")
-
-        $scope.$on "usform:edit", (ctx, us) ->
-            $scope.us = us
-            isNew = false
-            # Update texts for edition
-            $el.find(".button-green span").html("Save") #TODO: i18n
-            $el.find(".title").html("Edit user story  ") #TODO: i18n
-            $el.removeClass("hidden")
-
-            # Update requirement info (team, client or blocked)
-            if us.is_blocked
-                $el.find(".blocked-note").show()
-                $el.find("label.blocked").addClass("selected")
-            if us.team_requirement
-                $el.find("label.team-requirement").addClass("selected")
-            if us.client_requirement
-                $el.find("label.client-requirement").addClass("selected")
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
-        # Dom Event Handlers
-
-        $el.on "click", ".close", (event) ->
-            event.preventDefault()
-            $el.addClass("hidden")
-
-        $el.on "click", ".button-green", (event) ->
-            event.preventDefault()
-
-            form = $el.find("form").checksley()
-            if not form.validate()
-                return
-
-            if isNew
-                promise = $repo.create("userstories", $scope.us)
-                broadcastEvent = "usform:new:success"
-            else
-                promise = $repo.save($scope.us)
-                broadcastEvent = "usform:edit:success"
-
-            promise.then (data) ->
-                $el.addClass("hidden")
-                $rootScope.$broadcast(broadcastEvent, data)
-
-        $el.on "click", "label.blocked", (event) ->
-            event.preventDefault()
-            target = angular.element(event.currentTarget)
-            target.toggleClass("selected")
-            $scope.us.is_blocked = not $scope.us.is_blocked
-            $el.find(".blocked-note").toggle(400)
-
-        $el.on "click", "label.team-requirement", (event) ->
-            event.preventDefault()
-            angular.element(event.currentTarget).toggleClass("selected")
-            $scope.us.team_requirement = not $scope.us.team_requirement
-
-        $el.on "click", "label.client-requirement", (event) ->
-            event.preventDefault()
-            angular.element(event.currentTarget).toggleClass("selected")
-            $scope.us.client_requirement = not $scope.us.client_requirement
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
-    return {link: link}
-
-module.directive("tgLbCreateEditUserstory", [
-    "$tgRepo",
-    "$tgModel",
-    "$tgResources",
-    "$rootScope",
-    CreateEditUserstoryDirective
-])
-
-#############################################################################
-## Creare Bulk Userstories Lightbox Directive
-#############################################################################
-
-CreateBulkUserstoriesDirective = ($repo, $rs, $rootscope) ->
-    link = ($scope, $el, attrs) ->
-        $scope.form = {data: ""}
-
-        $scope.$on "usform:bulk", ->
-            $el.removeClass("hidden")
-            $scope.form = {data: ""}
-
-        $el.on "click", ".close", (event) ->
-            event.preventDefault()
-            $el.addClass("hidden")
-
-        $el.on "click", ".button-green", (event) ->
-            event.preventDefault()
-
-            form = $el.find("form").checksley()
-            if not form.validate()
-                return
-
-            data = $scope.form.data
-            projectId = $scope.projectId
-
-            $rs.userstories.bulkCreate(projectId, data).then (result) ->
-                $rootscope.$broadcast("usform:bulk:success", result)
-                $el.addClass("hidden")
-
-        $scope.$on "$destroy", ->
-            $el.off()
-
-    return {link: link}
-
-module.directive("tgLbCreateBulkUserstories", [
-    "$tgRepo",
-    "$tgResources",
-    "$rootScope",
-    CreateBulkUserstoriesDirective
-])
-
 #############################################################################
 ## Creare/Edit Sprint Lightbox Directive
 #############################################################################
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index b848c062..998d6f34 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -21,6 +21,9 @@
 
 module = angular.module("taigaCommon")
 
+#############################################################################
+## Block Directive
+#############################################################################
 
 BlockDirective = ->
     link = ($scope, $el, $attrs, $model) ->
@@ -53,3 +56,142 @@ BlockDirective = ->
     return {link:link, require:"ngModel"}
 
 module.directive("tgLbBlock", BlockDirective)
+
+
+#############################################################################
+## Create/Edit Userstory Lightbox Directive
+#############################################################################
+
+CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope) ->
+    link = ($scope, $el, attrs) ->
+        isNew = true
+
+        $scope.$on "usform:new", (ctx, statusId) ->
+            $scope.us = {
+                project: $scope.projectId
+                is_archived: false
+                status: $scope.project.default_us_status
+            }
+            isNew = true
+            # Update texts for creation
+            $el.find(".button-green span").html("Create") #TODO: i18n
+            $el.find(".title").html("New user story  ") #TODO: i18n
+            $el.removeClass("hidden")
+
+        $scope.$on "usform:edit", (ctx, us) ->
+            $scope.us = us
+            isNew = false
+            # Update texts for edition
+            $el.find(".button-green span").html("Save") #TODO: i18n
+            $el.find(".title").html("Edit user story  ") #TODO: i18n
+            $el.removeClass("hidden")
+
+            # Update requirement info (team, client or blocked)
+            if us.is_blocked
+                $el.find(".blocked-note").show()
+                $el.find("label.blocked").addClass("selected")
+
+            if us.team_requirement
+                $el.find("label.team-requirement").addClass("selected")
+            if us.client_requirement
+                $el.find("label.client-requirement").addClass("selected")
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+        # Dom Event Handlers
+
+        $el.on "click", ".close", (event) ->
+            event.preventDefault()
+            $el.addClass("hidden")
+
+        $el.on "click", ".button-green", (event) ->
+            event.preventDefault()
+
+            form = $el.find("form").checksley()
+            if not form.validate()
+                return
+
+            if isNew
+                promise = $repo.create("userstories", $scope.us)
+                broadcastEvent = "usform:new:success"
+            else
+                promise = $repo.save($scope.us)
+                broadcastEvent = "usform:edit:success"
+
+            promise.then (data) ->
+                $el.addClass("hidden")
+                $rootScope.$broadcast(broadcastEvent, data)
+
+        $el.on "click", "label.blocked", (event) ->
+            event.preventDefault()
+            target = angular.element(event.currentTarget)
+            target.toggleClass("selected")
+            $scope.us.is_blocked = not $scope.us.is_blocked
+            $el.find(".blocked-note").toggle(400)
+
+        $el.on "click", "label.team-requirement", (event) ->
+            event.preventDefault()
+            angular.element(event.currentTarget).toggleClass("selected")
+            $scope.us.team_requirement = not $scope.us.team_requirement
+
+        $el.on "click", "label.client-requirement", (event) ->
+            event.preventDefault()
+            angular.element(event.currentTarget).toggleClass("selected")
+            $scope.us.client_requirement = not $scope.us.client_requirement
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+    return {link: link}
+
+module.directive("tgLbCreateEditUserstory", [
+    "$tgRepo",
+    "$tgModel",
+    "$tgResources",
+    "$rootScope",
+    CreateEditUserstoryDirective
+])
+
+
+#############################################################################
+## Creare Bulk Userstories Lightbox Directive
+#############################################################################
+
+CreateBulkUserstoriesDirective = ($repo, $rs, $rootscope) ->
+    link = ($scope, $el, attrs) ->
+        $scope.form = {data: ""}
+
+        $scope.$on "usform:bulk", ->
+            $el.removeClass("hidden")
+            $scope.form = {data: ""}
+
+        $el.on "click", ".close", (event) ->
+            event.preventDefault()
+            $el.addClass("hidden")
+
+        $el.on "click", ".button-green", (event) ->
+            event.preventDefault()
+
+            form = $el.find("form").checksley()
+            if not form.validate()
+                return
+
+            data = $scope.form.data
+            projectId = $scope.projectId
+
+            $rs.userstories.bulkCreate(projectId, data).then (result) ->
+                $rootscope.$broadcast("usform:bulk:success", result)
+                $el.addClass("hidden")
+
+        $scope.$on "$destroy", ->
+            $el.off()
+
+    return {link: link}
+
+module.directive("tgLbCreateBulkUserstories", [
+    "$tgRepo",
+    "$tgResources",
+    "$rootScope",
+    CreateBulkUserstoriesDirective
+])