diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html
index 7eec86215a..666aa1de81 100644
--- a/cms/templates/widgets/html-edit.html
+++ b/cms/templates/widgets/html-edit.html
@@ -33,8 +33,8 @@
     </section>
   </section>
 
-  <textarea name="" class="edit-box" rows="8" cols="40">${module.definition['data']['text']}</textarea>
-  <div class="preview">${module.definition['data']['text']}</div>
+  <textarea name="" class="edit-box" rows="8" cols="40">${module.definition['data']}</textarea>
+  <div class="preview">${module.definition['data']}</div>
 
   <div class="actions wip">
     <a href="" class="save-update">Save &amp; Update</a>
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index bed0d1b4f8..ea158d305a 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -40,8 +40,8 @@
       <header>
         <h1><a href="#" class="module-edit" id="${week.location.url()}">${week.name}</a></h1>
         <ul>
-          % if week.goals:
-            % for goal in week.goals:
+          % if 'goals' in week.metadata:
+            % for goal in week.metadata['goals']:
             <li class="goal editable">${goal}</li>
             % endfor
           % else: