diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index a5f10f24..ac04cb43 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -7,10 +7,11 @@ block content
     form.wrapper(tg-issue-detail, ng-controller="IssueDetailController as ctrl",
                  ng-init="section='issues'")
         div.main.us-detail
-            div.us-detail-header
+            div.us-detail-header.header-with-actions
                 include views/components/mainTitle
-                a.button.button-green.save-issue(href="", title="Save") Save
-                a.button.button-red.cancel(tg-nav="project-issues-detail:project=project.slug, ref=issue.ref", href="", title="Cancel") Cancel
+                .action-buttons
+                    a.button.button-green.save-issue(href="", title="Save") Save
+                    a.button.button-red.cancel(tg-nav="project-issues-detail:project=project.slug, ref=issue.ref", href="", title="Cancel") Cancel
 
             section.us-story-main-data
                 div.us-title(ng-class="{blocked: issue.is_blocked}")
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 02f6ec7a..c5408b16 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -7,9 +7,10 @@ block content
     div.wrapper(tg-issue-detail, ng-controller="IssueDetailController as ctrl",
                 ng-init="section='issues'")
         div.main.us-detail
-            div.us-detail-header
+            div.us-detail-header.header-with-actions
                 include views/components/mainTitle
-                a.button.button-green(tg-check-permission, permission="modify_issue", href="", title="Edit", tg-nav="project-issues-detail-edit:project=project.slug,ref=issue.ref") Edit
+                .action-buttons
+                    a.button.button-green(tg-check-permission, permission="modify_issue", href="", title="Edit", tg-nav="project-issues-detail-edit:project=project.slug,ref=issue.ref") Edit
 
             section.us-story-main-data
                 div.us-title(ng-class="{blocked: issue.is_blocked}")
diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade
index 9413ab38..e371f73f 100644
--- a/app/partials/us-detail-edit.jade
+++ b/app/partials/us-detail-edit.jade
@@ -7,10 +7,11 @@ block content
     form.wrapper(tg-us-detail, ng-controller="UserStoryDetailController as ctrl",
                 ng-init="section='backlog'")
         div.main.us-detail
-            div.us-detail-header
+            div.us-detail-header.header-with-actions
                 include views/components/mainTitle
-                a.button.button-green.save-us(href="", title="Save") Save
-                a.button.button-red.cancel(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", href="", title="Cancel") Cancel
+                .action-buttons
+                    a.button.button-green.save-us(href="", title="Save") Save
+                    a.button.button-red.cancel(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", href="", title="Cancel") Cancel
 
             section.us-story-main-data
                 div.us-title(ng-class="{blocked: us.is_blocked}")
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 35f50a2b..1495a48c 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -7,9 +7,10 @@ block content
     div.wrapper(tg-us-detail, ng-controller="UserStoryDetailController as ctrl",
                 ng-init="section='backlog'")
         div.main.us-detail
-            div.us-detail-header
+            div.us-detail-header.header-with-actions
                 include views/components/mainTitle
-                a.button.button-green(tg-check-permission, permission="modify_us", href="", title="Edit", tg-nav="project-userstories-detail-edit:project=project.slug,ref=us.ref") Edit
+                .action-buttons
+                    a.button.button-green(tg-check-permission, permission="modify_us", href="", title="Edit", tg-nav="project-userstories-detail-edit:project=project.slug,ref=us.ref") Edit
 
             section.us-story-main-data
                 div.us-title(ng-class="{blocked: us.is_blocked}")
diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss
index 54566fb9..31588507 100755
--- a/app/styles/dependencies/typography.scss
+++ b/app/styles/dependencies/typography.scss
@@ -43,12 +43,18 @@ h6 {
 h1 {
     @extend %xxlarge;
     @extend %title;
+    display: flex;
     line-height: 2.7rem;
     margin-bottom: 1rem;
     text-transform: uppercase;
     span {
-        display: inline;
         margin-right: .5rem;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        &.green, &:last-child {
+            flex-shrink: 0;
+        }
     }
     .green {
         color: $green-taiga;
diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss
index f0f8ea47..b22b6a8b 100644
--- a/app/styles/layout/base.scss
+++ b/app/styles/layout/base.scss
@@ -113,14 +113,13 @@ body {
     align-items: center;
     display: flex;
     justify-content: space-between;
-    h1 {
-        span {
-            white-space: inherit;
-        }
-    }
+    margin-bottom: 1rem;
     .action-buttons {
         flex-shrink: 0;
         margin-right: 2rem;
         padding-left: 1rem;
     }
+    h1 {
+        margin-bottom: 0;
+    }
 }
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index e8ee8c24..8f3b310a 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -1,16 +1,3 @@
-.us-detail-header {
-    position: relative;
-    .button {
-        color: $white;
-        position: absolute;
-        right: 0;
-        top: 0;
-    }
-    .cancel {
-        right: 7rem;
-    }
-}
-
 .us-story-main-data {
     margin-bottom: 2rem;
     .us-title {