diff --git a/website/client-old/css/tasks.styl b/website/client-old/css/tasks.styl
index ad101c9ea5..f911864cdb 100644
--- a/website/client-old/css/tasks.styl
+++ b/website/client-old/css/tasks.styl
@@ -556,7 +556,11 @@ form
         min-width: 2.5em
   .save-close
     text-align: center
+    display: inline
+    padding: 0 0.5em
     @extend $hrpg-button
+  h2#task-edit-title
+    margin-top: 1em
 
 // Dailies
 .dailies
diff --git a/website/views/shared/tasks/edit/index.jade b/website/views/shared/tasks/edit/index.jade
index 96c138667b..6a41b54576 100644
--- a/website/views/shared/tasks/edit/index.jade
+++ b/website/views/shared/tasks/edit/index.jade
@@ -1,7 +1,14 @@
 div(ng-if='task._editing')
   .task-options
-    h2 {{task._edit.text}}
-  
+    .save-close
+      button(type='submit', ng-click='saveTask(task,false,true); $close()')=env.t('saveAndClose')
+    .save-close
+      button(ng-click='cancelTaskEdit(task); $close()')=env.t('cancel')
+
+    br
+
+    h2#task-edit-title {{task._edit.text}}
+
     // Broken Challenge
     .well(ng-if='task.challenge.broken')
       div(ng-if='task.challenge.broken=="TASK_DELETED" || task.challenge.broken=="CHALLENGE_TASK_NOT_FOUND"')
@@ -51,10 +58,5 @@ div(ng-if='task._editing')
 
       .save-close
         button(type='submit', ng-click='saveTask(task,false,true); $close()')=env.t('saveAndClose')
-      
-      br
-      br
-      
       .save-close
         button(ng-click='cancelTaskEdit(task); $close()')=env.t('cancel')
-