diff --git a/app/partials/backlog.jade b/app/partials/backlog.jade
index 82fc55ac..d6a42475 100644
--- a/app/partials/backlog.jade
+++ b/app/partials/backlog.jade
@@ -25,9 +25,9 @@ block content
             include views/modules/backlog-table
         sidebar.menu-secondary.sidebar
             include views/modules/sprints
-        div.lightbox.lightbox_add-new-us.hidden(tg-lightbox-create-edit-userstory)
+        div.lightbox.lightbox_add-new-us.hidden(tg-lb-create-edit-userstory)
             include views/modules/lightbox_add-new-us
-        div.lightbox.lightbox_add-bulk.hidden
+        div.lightbox.lightbox_add-bulk.hidden(tg-lb-create-bulk-userstories)
             include views/modules/lightbox_add-bulk
         div.lightbox.lightbox_add-sprint.hidden
             include views/modules/lightbox_add-sprint
diff --git a/app/partials/views/components/summary.jade b/app/partials/views/components/summary.jade
index d8355d28..50650191 100644
--- a/app/partials/views/components/summary.jade
+++ b/app/partials/views/components/summary.jade
@@ -1,19 +1,19 @@
-div.summary
-  div.summary-progress-bar
-    div.current-progress
-  div.data
-    span.number 30%
-    span.description completed
-  ul
-    li
-      span.number 12
-      span.description project<br />points
-    li
-      span.number 23
-      span.description defined<br />points
-    li
-      span.number 12
-      span.description assigned<br />points
-    li
-      span.number 23
-      span.description closed<br />points
+div.summary(tg-backlog-summary)
+    div.summary-progress-bar
+        div.current-progress
+    div.data
+        span.number 30%
+        span.description completed
+    ul
+        li
+            span.number 12
+            span.description project<br />points
+        li
+            span.number 23
+            span.description defined<br />points
+        li
+            span.number 12
+            span.description assigned<br />points
+        li
+            span.number 23
+            span.description closed<br />points
diff --git a/app/partials/views/modules/lightbox_add-bulk.jade b/app/partials/views/modules/lightbox_add-bulk.jade
index 8ed503c5..e630f230 100644
--- a/app/partials/views/modules/lightbox_add-bulk.jade
+++ b/app/partials/views/modules/lightbox_add-bulk.jade
@@ -1,8 +1,8 @@
 a.close(href="", title="close")
     span.icon.icon-delete
 form
-    h2.title New Bulk
+    h2.title(tg-i18n="common.new-bulk")
     fieldset
-        textarea(placeholder="One user story per line")
-    a.button.button-green(href="", title="Save")
-        span Create
+        textarea(tg-i18n="placeholder:common.one-item-line", ng-model="form.data")
+    a.button.button-green(href="", tg-i18n="title:common.save")
+        span(tg-i18n="common.save")
diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade
index 70485679..199c1883 100644
--- a/app/partials/views/modules/lightbox_add-new-us.jade
+++ b/app/partials/views/modules/lightbox_add-new-us.jade
@@ -1,29 +1,32 @@
 a.close(href="", title="close")
     span.icon.icon-delete
 form
-    h2.title New User Story
+    h2.title(tg-i18n="us.title-new")
     fieldset
-        input(type="text", placeholder="Subject")
+        input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject")
     fieldset
-        select
-            option(selected, value="open") Open
-            option(selected, value="closed") Closed
+        select(ng-model="us.status", ng-options="s.name for s in statusList",
+               tg-i18n="placeholder:common.status")
     fieldset
-        input(type="text", placeholder="Tags")
+        input(type="text", placeholder="Tags", tg-tags, ng-model="us.tags")
     fieldset
         div.markdown-preview
-            a.active(href="", title="Edit") Edit
-            a(href="", title="Preview") Preview
-        textarea(placeholder="One user story per line")
+            a.edit.active(href="", title="Edit") Edit
+            a.preview(href="", title="Preview") Preview
+        textarea(placeholder="One user story per line", ng-model="us.description")
     div.new-us-settings
         fieldset
-            label.requirement(for="team-requirement") Team Requirement
-            input(type="checkbox", name="team-requirement", id="team-requirement")
+            label.requirement(for="team-requirement", tg-i18n="us.team-requirement")
+            input(
+                type="checkbox", ng-model="us.team_requirement",
+                name="team-requirement", id="team-requirement")
         fieldset
-            label.requirement(for="client-requirement") Team Requirement
-            input(type="checkbox", name="client-requirement", id="client-requirement")
+            label.requirement(for="client-requirement", tg-i18n="us.client-requirement")
+            input(
+                type="checkbox", ng-model="us.client_requirement",
+                name="client-requirement", id="client-requirement")
         fieldset
-            label.blocked(for="blocked-us") Blocked
-            input(type="checkbox", name="blocked-us", id="blocked-us")
+            label.blocked(for="blocked-us", tg-i18n="common.blocked")
+            input(type="checkbox", ng-model="us.blocked", name="blocked-us", id="blocked-us")
     a.button.button-green(href="", title="Save")
         span Create