diff --git a/nlg/app/nlg.js b/nlg/app/nlg.js
index 31602e8..9d0ecfa 100644
--- a/nlg/app/nlg.js
+++ b/nlg/app/nlg.js
@@ -271,22 +271,19 @@ function refreshTemplates() {
   // Refresh the output of all templates in the current narrative.
   templates = []
   $.getJSON(`${nlg_base}/narratives`).done((e) => {
-    for (let i=0; i<e.narrative.length;i++) {
-      refreshTemplate(i)
+    if (e.narrative.length > 0) {
+      for (let i=0; i<e.narrative.length;i++) {
+        refreshTemplate(i)
+      }
+    } else {
+      renderPreview(null)
     }
   })
 }
 
 function deleteTemplate(n) {
   // Delete a template
-  $.getJSON(`${nlg_base}/nuggets/${n}?delete`).done((e) => {
-    templates = []
-    for (i=0; i<e.length; i++) {
-      templates[i] = new Template(e[i])
-      $('#tmpl-setting-preview').html(templates[i].previewHTML())
-    }
-    renderPreview(null)
-  })
+  $.getJSON(`${nlg_base}/nuggets/${n}?delete`).done(refreshTemplates)
 }
 
 function triggerTemplateSettings(sentid) {
diff --git a/nlg/webapp.py b/nlg/webapp.py
index 266a65b..ff6dba9 100644
--- a/nlg/webapp.py
+++ b/nlg/webapp.py
@@ -142,7 +142,7 @@ def get_nugget(handler):
     nugget_id = int(handler.path_args[0])
     if 'delete' in handler.args:
         del NARRATIVE_CACHE[handler.current_user.id][nugget_id]
-        return json.dumps(NARRATIVE_CACHE[handler.current_user.id].to_dict())
+        return NARRATIVE_CACHE[handler.current_user.id].to_dict()
     else:
         nugget = NARRATIVE_CACHE[handler.current_user.id][nugget_id]
         nugget = nugget.to_dict()
@@ -200,8 +200,11 @@ def render_narrative(handler):
     narrative = NARRATIVE_CACHE.get(handler.current_user.id, False)
     if narrative:
         style_kwargs = get_style_kwargs(handler.args)
-        return {'render': narrative.to_html(**style_kwargs, df=orgdf),
-                'style': narrative.html_style}
+        pl = {'render': narrative.to_html(**style_kwargs, df=orgdf),
+              'style': narrative.html_style}
+    else:
+        pl = {'render': '', 'style': Narrative.default_style}
+    return pl
 
 
 def get_original_df(handler):