diff --git a/webapp/web/css/dump.css b/webapp/web/css/dump.css
index 734fca46d..8e3308e25 100644
--- a/webapp/web/css/dump.css
+++ b/webapp/web/css/dump.css
@@ -3,7 +3,7 @@
 /* Styles for Freemarker template variable dump */
 
 .dump {
-    border-top: 1px solid #ccc;
+    border-top: 3px solid #ccc;
     border-bottom: 3px solid #ccc;
     padding: 1em 0;
     margin: 1em 0;
@@ -16,3 +16,9 @@
 .dump.directive h6 {
     margin-top: 1em;
 }
+
+.dump.datamodel .var, .dump.datamodel .directive {
+    border-bottom: 1px solid #ccc; 
+    padding: 1em 0;
+    margin: 1em 0;   
+}
diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl
index 62c51a767..70f36036a 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/dump-var.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for dumping a template variable -->
  
-<div class="dump"> 
+<div class="var"> 
 
     <h6>Variable name: <em>${var}</em></h6>
     <strong>Type:</strong> ${type}<br />
diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
index 232607e2d..4cdbf4c4a 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
@@ -2,8 +2,10 @@
 
 <#-- Template for dump directive -->
 
-<h3>Template variable dump</h3>
+<div class="dump">
+    <h3>Template variable dump</h3>
     
-${var}
+    ${var}
+</div>
 
 ${stylesheets.add("/css/dump.css")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/dump/help-directive.ftl b/webapp/web/templates/freemarker/body/partials/dump/help-directive.ftl
index b4d917dae..2bb157ed8 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/help-directive.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/help-directive.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for displaying directive help -->
 
-<div class="dump directive">
+<div class="directive">
     <p><strong>Directive name:</strong> ${name}</p> 
     
     <#if effect??>
diff --git a/webapp/web/templates/freemarker/body/partials/dump/help.ftl b/webapp/web/templates/freemarker/body/partials/dump/help.ftl
index 92e230320..1e8c13b76 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/help.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/help.ftl
@@ -2,9 +2,10 @@
 
 <#-- Template for displaying directive help -->
 
-
-<h3>Template directive help</h3>
-    
-${help}
+<div class="dump help">
+    <h3>Template directive help</h3>
+        
+    ${help}
+</div>
 
 ${stylesheets.add("/css/dump.css")}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/test.ftl b/webapp/web/templates/freemarker/body/test.ftl
index a5387e236..841f893cf 100644
--- a/webapp/web/templates/freemarker/body/test.ftl
+++ b/webapp/web/templates/freemarker/body/test.ftl
@@ -51,7 +51,6 @@
 <@dump var="urls" />
 <@dump var="fruit" />
 <@dump var="trueStatement" />
-<@dump var="falseStatement" /> 
 <@dump var="zoo1" />
 
 
@@ -65,3 +64,4 @@ ${scripts.add("/js/script1.js", "/js/script2.js", "/js/script3.js")}
 <@help directive="dump" />
 
 <@describe var="stylesheets" />
+