diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 76379ec3..c900cb2d 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -33,7 +33,7 @@ block content
 
                 div(tg-tag-line, editable="true", autosave-model="issue", ng-model="issue.tags", required-perm="modify_issue")
 
-            section.us-content.wysiwyg(tg-editable-description, ng-model="issue", required-perm="modify_issue")
+            section.duty-content.wysiwyg(tg-editable-description, ng-model="issue", required-perm="modify_issue")
 
             tg-attachments(ng-model="issue", type="issue")
             tg-history(ng-model="issue", type="issue")
diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade
index 33b2faa9..bad97c00 100644
--- a/app/partials/task-detail.jade
+++ b/app/partials/task-detail.jade
@@ -36,7 +36,7 @@ block content
 
                 div(tg-tag-line, editable="true", autosave-model="task", ng-model="task.tags", required-perm="modify_task")
 
-            section.us-content.wysiwyg(tg-editable-description, ng-model="task", required-perm="modify_task")
+            section.duty-content.wysiwyg(tg-editable-description, ng-model="task", required-perm="modify_task")
 
             tg-attachments(ng-model="task", type="task")
             tg-history(ng-model="task", type="task")
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index 33dea01f..d858d5a9 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -38,7 +38,7 @@ block content
 
                 div(tg-tag-line, editable="true", autosave-model="us", ng-model="us.tags", required-perm="modify_us")
 
-            section.us-content.wysiwyg(tg-editable-description, ng-model="us", required-perm="modify_us")
+            section.duty-content.wysiwyg(tg-editable-description, ng-model="us", required-perm="modify_us")
 
             include views/modules/related-tasks
 
diff --git a/app/styles/components/markitup.scss b/app/styles/components/markitup.scss
new file mode 100644
index 00000000..742257e0
--- /dev/null
+++ b/app/styles/components/markitup.scss
@@ -0,0 +1,21 @@
+.markItUpHeader {
+    ul {
+        background: $whitish;
+        padding: .3rem;
+        li {
+            display: inline-block;
+            float: none;
+            a {
+                opacity: .8;
+                &:hover {
+                    @include transition(opacity .2s linear);
+                    opacity: .3;
+                }
+            }
+        }
+        .preview-icon {
+            position: absolute;
+            right: 2.5rem;
+        }
+    }
+}
diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss
index 3c4b72df..3477216f 100644
--- a/app/styles/layout/us-detail.scss
+++ b/app/styles/layout/us-detail.scss
@@ -166,12 +166,24 @@
     }
 }
 
-.us-content {
+.duty-content {
+    position: relative;
     textarea {
         background: $white;
         height: 10rem;
         margin-bottom: 2rem;
     }
+    a.save {
+        color: $blackish;
+        opacity: .8;
+        position: absolute;
+        right: 1rem;
+        top: .6rem;
+        &:hover {
+            @include transition(opacity .2s linear);
+            opacity: .3;
+        }
+    }
     .save-container {
         &.loading span {
             @include animation (loading .5s linear);