diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json
index 5c1603e26f..463c47894a 100644
--- a/common/locales/en/tasks.json
+++ b/common/locales/en/tasks.json
@@ -17,6 +17,7 @@
     "checklistText": "For Dailies, partially completed checklists reduce damage. For example, a 4-item checklist with 3 completed reduces damage for that incomplete Daily to 25%. Completed checklist items on a To-Do add a multiplier: 3 checks means +3x (total 4x) the Experience, Gold, and Mana.",
     "expandCollapse": "Expand/Collapse",
     "text": "Text",
+    "title": "Title",
     "extraNotes": "Extra Notes",
     "direction/Actions": "Direction/Actions",
     "advancedOptions": "Advanced Options",
diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl
index c715681af8..b267f22d87 100644
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -391,8 +391,8 @@ form
 
   .option-title
     font-size: 1em
-    margin: 0 0 0.5em
-    line-height: 2.5
+    margin: 0.5em 0 0.5em
+    line-height: 1.0
     border: 0
     padding: 0
     //color: #333
@@ -556,6 +556,7 @@ form
     li
       @extend $hrpg-button
       button
+        margin-top: 0.5em
         span
           margin-right: 0.5em
   > form
diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade
index 9350697474..bae8c724fc 100644
--- a/website/views/shared/tasks/task.jade
+++ b/website/views/shared/tasks/task.jade
@@ -124,6 +124,12 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
             |  | 
             a(ng-click="unlink(task, 'remove-all')")=env.t('removeThem')
 
+
+      form(ng-submit='saveTask(task,false,true)')
+        // Title text input
+        label.option-title=env.t('title')
+        input.option-content(type='text', ng-model='task.text', required, ng-disabled='task.challenge.id')
+
       // Checklists
       .task-checklist-edit(ng-if='!$state.includes("options.social.challenges")')
         ul
@@ -132,24 +138,20 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
               span.glyphicon.glyphicon-tasks
               span=env.t('addChecklist')
         form.checklist-form(ng-if='task.checklist')
-          fieldset.option-group(ng-if='!$state.includes("options.social.challenges")')
-            legend.option-title
-              span.hint(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')=env.t('checklist')
-            ul(hrpg-sort-checklist)
-              li(ng-repeat='item in task.checklist') 
-                //input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
-                //-,ng-blur='saveTask(task,true)')
-                span.checklist-icon.glyphicon.glyphicon-resize-vertical()
-                input(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")
-                a(ng-click='removeChecklistItem(task,$event,$index,true)')
-                  span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
+          legend.option-title(ng-if='task.checklist[0]')
+            span.hint(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')=env.t('checklist')
+          ul(hrpg-sort-checklist)
+            li(ng-repeat='item in task.checklist') 
+              //input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)')
+              //-,ng-blur='saveTask(task,true)')
+              span.checklist-icon.glyphicon.glyphicon-resize-vertical()
+              input(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}")
+              a(ng-click='removeChecklistItem(task,$event,$index,true)')
+                span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
 
       form(ng-submit='saveTask(task,false,true)')
-        // text & notes
+        // Notes text input
         fieldset.option-group
-          label.option-title=env.t('text')
-          input.option-content(type='text', ng-model='task.text', required, ng-disabled='task.challenge.id')
-
           label.option-title=env.t('extraNotes')
           textarea.option-content(rows='3', ng-model='task.notes', ng-model-options="{debounce: 1000}")