diff --git a/src/app/challenges.coffee b/src/app/challenges.coffee
index 2464631e70..f6f5ea67cb 100644
--- a/src/app/challenges.coffee
+++ b/src/app/challenges.coffee
@@ -5,7 +5,7 @@ module.exports.app = (appExports, model) ->
     model.set '_challenge.new',
       name: ''
       habits: []
-      dailies: []
+      daily: []
       todos: []
       rewards: []
       assignees: 'party'
diff --git a/views/app/challenges.html b/views/app/challenges.html
index 49a89d8dce..88051459a5 100644
--- a/views/app/challenges.html
+++ b/views/app/challenges.html
@@ -51,16 +51,19 @@
         {#unless _challenge.creating}
             <a x-bind='click:challengeCreate' class='btn btn-large btn-success'>Create New Challenge</a>
         {else}
-            <form x-bind='submit:challengeSave' class=form-horizontal>
-                <input id='newChallengeName' type='text' value={_challenge.new.name} placeholder="Challenge Title" required/>
+            <input id='newChallengeName' type='text' value={_challenge.new.name} placeholder="Challenge Title" required/>
 
-                <div class="grid">
-                    ...
-                </div>
+            <div class="grid">
+                <app:tasks:task-lists
+                        habits={_challenge.new.habits}
+                        dailys={_challenge.new.dailys}
+                        todos={_challenge.new.todos}
+                        rewards={_challenge.new.rewards}
+                        editable=true />
+            </div>
 
-                <input type='submit' class='btn btn-large btn-success' value='Save' />
-                <input type='button' x-bind='click:challengeDiscard' class='btn btn-large btn-danger' value=Discard />
-            </form>
+            <input type='submit' x-bind="click:submit:challengeSave" class='btn btn-large btn-success' value='Save' />
+            <input type='button' x-bind='click:challengeDiscard' class='btn btn-large btn-danger' value=Discard />
         {/}
 
     </div>