diff --git a/blocktopmenu.php b/blocktopmenu.php
index 8d9f0c4..ced55bb 100644
--- a/blocktopmenu.php
+++ b/blocktopmenu.php
@@ -554,7 +554,7 @@ class Blocktopmenu extends Module implements WidgetInterface
                     if (count($cms)) {
                         $root_node['children'][] = $this->makeNode([
                             'type' => 'cms-page',
-                            'type' => 'cms-page-' . $id,
+                            'page_identifier' => 'cms-page-' . $id,
                             'label' => $cms[0]['meta_title'],
                             'url' => $cms[0]['link']
                         ]);
@@ -1409,7 +1409,6 @@ class Blocktopmenu extends Module implements WidgetInterface
         }
 
         $page_identifier = $this->getCurrentPageIdentifier();
-
         // Mark the current page
         return $this->mapTree(function (array $node) use ($page_identifier) {
             $node['current'] = ($page_identifier === $node['page_identifier']);
diff --git a/blocktopmenu.tpl b/blocktopmenu.tpl
index 88ba14e..7e3aedf 100644
--- a/blocktopmenu.tpl
+++ b/blocktopmenu.tpl
@@ -1,21 +1,27 @@
 {function name="menu" nodes=[] depth=0}
-  {if $nodes|count}
-    <ul class="menu" data-depth="{$depth}">
-      {foreach from=$nodes item=node}
-        <li class="{$node.type}{if $node.current} current{/if}">
-          <a href="{$node.url}" {if $node.open_in_new_window} target="_blank" {/if}>{$node.label}</a>
-          {menu nodes=$node.children depth=$node.depth}
-          {if $node.image_urls|count}
-            <div class="menu-images-container">
-              {foreach from=$node.image_urls item=image_url}
-                <img src="{$image_url}">
-              {/foreach}
+  {strip}
+    {if $nodes|count}
+      <ul data-depth="{$depth}">
+        {foreach from=$nodes item=node}
+          <li class="{$node.type}{if $node.current} current{/if}">
+            <a href="{$node.url}" {if $node.open_in_new_window} target="_blank" {/if}>{$node.label}</a>
+            <div>
+              {menu nodes=$node.children depth=$node.depth}
+              {if $node.image_urls|count}
+                <div class="menu-images-container">
+                  {foreach from=$node.image_urls item=image_url}
+                    <img src="{$image_url}">
+                  {/foreach}
+                </div>
+              {/if}
             </div>
-          {/if}
-        </li>
-      {/foreach}
-    </ul>
-  {/if}
+          </li>
+        {/foreach}
+      </ul>
+    {/if}
+  {/strip}
 {/function}
 
-{menu nodes=$menu.children}
+<div class="menu">
+    {menu nodes=$menu.children}
+</div>