diff --git a/templates/core/moremenu.mustache b/templates/core/moremenu.mustache
index ed350ae1846..bcad295a26c 100644
--- a/templates/core/moremenu.mustache
+++ b/templates/core/moremenu.mustache
@@ -55,17 +55,44 @@
     <ul id="moremenu-{{moremenuid}}-{{navbarstyle}}" role="{{#istablist}}tablist{{/istablist}}{{^istablist}}menubar{{/istablist}}" class="nav more-nav {{navbarstyle}}">
         {{#nodecollection}}
             {{#children}}
-                {{> core/moremenu_children}}
+                {{#haschildren}}
+                    <li class="dropdown nav-item {{#menuclasses}}{{.}} {{/menuclasses}} " role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> core/moremenu_children}}
+                    </li>
+                {{/haschildren}}
+                {{^haschildren}}
+                    <li data-key="{{key}}" class="nav-item {{#menuclasses}}{{.}} {{/menuclasses}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> core/moremenu_children}}
+                    </li>
+                {{/haschildren}}
             {{/children}}
         {{/nodecollection}}
         {{#nodearray}}
         {{!-- Menu with card style --}}
             {{#card}}
-                {{> theme_boost_union/smartmenus-cardmenu-children}}
+                {{#haschildren}}
+                    <li class="dropdown nav-item {{#card}} card-dropdown {{/card}} {{#menudata.classes}} {{.}} {{/menudata.classes}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> theme_boost_union/smartmenus-cardmenu-children}}
+                    </li>
+                {{/haschildren}}
+                {{^haschildren}}
+                    <li data-key="{{key}}" class="nav-item" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> theme_boost_union/smartmenus-cardmenu-children}}
+                    </li>
+                {{/haschildren}}
             {{/card}}
 
             {{^card}}
-                {{> core/moremenu_children}}
+                {{#haschildren}}
+                    <li class="dropdown nav-item {{#menuclasses}}{{.}} {{/menuclasses}} " role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> core/moremenu_children}}
+                    </li>
+                {{/haschildren}}
+                {{^haschildren}}
+                    <li data-key="{{key}}" class="nav-item {{#menuclasses}}{{.}} {{/menuclasses}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                        {{> core/moremenu_children}}
+                    </li>
+                {{/haschildren}}
             {{/card}}
         {{/nodearray}}
         {{^drawer}}
diff --git a/templates/core/moremenu_children.mustache b/templates/core/moremenu_children.mustache
index f6fc29f3c6b..acd99b5f13d 100644
--- a/templates/core/moremenu_children.mustache
+++ b/templates/core/moremenu_children.mustache
@@ -27,7 +27,8 @@
         "text": "Moodle community",
         "children": "",
         "title": "Moodle community",
-        "url": "https://moodle.org"
+        "url": "https://moodle.org",
+        "hidemenuitemrole": true
     }
 }}
 {{!
@@ -38,111 +39,117 @@
     * Added smart menu submenu support.
 }}
 {{#haschildren}}
-    <li class="dropdown nav-item {{#menuclasses}}{{.}} {{/menuclasses}} " role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
-        <a class="dropdown-toggle nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}" id="drop-down-{{moremenuid}}" role="menuitem" data-toggle="dropdown"
-            aria-haspopup="true" aria-expanded="false" href="#" aria-controls="drop-down-menu-{{moremenuid}}"
-            {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-            {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-            {{#isactive}}aria-current="true"{{/isactive}}
-            {{^isactive}}tabindex="-1"{{/isactive}}
-        >
-            {{{text}}}
-        </a>
-        <div class="dropdown-menu" role="menu" id="drop-down-menu-{{moremenuid}}" aria-labelledby="drop-down-{{moremenuid}}">
-            {{#helpicon}}<div class="menu-helpicon">{{{helpicon}}}</div>{{/helpicon}}
-            {{#abovehelptext}}<div class="menu-description">{{{helptext}}}</div>{{/abovehelptext}}
-            {{#children}}
-                {{^divider}}
-                    {{#haschildren}}
-                    <div class="dropdown-submenu" role="none" >
-                    {{/haschildren}}
-                    {{#is_action_link}}
-                        <a class="dropdown-item {{#itemdata.classes}}{{.}} {{/itemdata.classes}}" role="menuitem" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}"
-                            {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                            {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                            data-disableactive="true" tabindex="-1"
-                        >
-                            {{{text}}}
-                        </a>
-                        {{#action_link_actions}}
-                            {{> core/actions }}
-                        {{/action_link_actions}}
-                    {{/is_action_link}}
-                    {{^is_action_link}}
-                        <a class="dropdown-item {{#itemdata.classes}}{{.}} {{/itemdata.classes}}" role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1"
-                            {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                            {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                        >
-                            {{{text}}}
-                        </a>
-                    {{/is_action_link}}
-                    {{#haschildren}}
-                        <ul>
-                            {{#children}}
-                                {{> core/moremenu_children}}
-                            {{/children}}
-                        </ul>
-                    </div>
-                    {{/haschildren}}
-                {{/divider}}
-                {{#divider}}
-                    <div class="dropdown-divider"></div>
-                {{/divider}}
-            {{/children}}
-            {{#belowhelptext}}<div class="menu-description">{{{helptext}}}</div>{{/belowhelptext}}
-        </div>
-    </li>
+    <a class="dropdown-toggle nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}" id="drop-down-{{moremenuid}}" role="menuitem" data-toggle="dropdown"
+        aria-haspopup="true" aria-expanded="false" href="#" aria-controls="drop-down-menu-{{moremenuid}}"
+        {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+        {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+        {{#isactive}}aria-current="true"{{/isactive}}
+        {{^isactive}}tabindex="-1"{{/isactive}}
+    >
+        {{{text}}}
+    </a>
+    <div class="dropdown-menu" role="menu" id="drop-down-menu-{{moremenuid}}" aria-labelledby="drop-down-{{moremenuid}}">
+        {{#helpicon}}<div class="menu-helpicon">{{{helpicon}}}</div>{{/helpicon}}
+        {{#abovehelptext}}<div class="menu-description">{{{helptext}}}</div>{{/abovehelptext}}
+        {{#children}}
+            {{^divider}}
+                {{#haschildren}}
+                <div class="dropdown-submenu" role="none" >
+                {{/haschildren}}
+                {{#is_action_link}}
+                    <a class="dropdown-item {{#itemdata.classes}}{{.}} {{/itemdata.classes}}" role="menuitem" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}"
+                        {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                        {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+                        data-disableactive="true" tabindex="-1"
+                    >
+                        {{{text}}}
+                    </a>
+                    {{#action_link_actions}}
+                        {{> core/actions }}
+                    {{/action_link_actions}}
+                {{/is_action_link}}
+                {{^is_action_link}}
+                    <a class="dropdown-item {{#itemdata.classes}}{{.}} {{/itemdata.classes}}" role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1"
+                        {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                        {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+                    >
+                        {{{text}}}
+                    </a>
+                {{/is_action_link}}
+                {{#haschildren}}
+                    <ul>
+                        {{#children}}
+                            {{#haschildren}}
+                                <li class="dropdown nav-item {{#menuclasses}}{{.}} {{/menuclasses}} " role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                                    {{> core/moremenu_children}}
+                                </li>
+                            {{/haschildren}}
+                            {{^haschildren}}
+                                <li data-key="{{key}}" class="nav-item {{#menuclasses}}{{.}} {{/menuclasses}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
+                                    {{> core/moremenu_children}}
+                                </li>
+                            {{/haschildren}}
+                        {{/children}}
+                    </ul>
+                </div>
+                {{/haschildren}}
+            {{/divider}}
+            {{#divider}}
+                <div class="dropdown-divider"></div>
+            {{/divider}}
+        {{/children}}
+        {{#belowhelptext}}<div class="menu-description">{{{helptext}}}</div>{{/belowhelptext}}
+    </div>
+
 {{/haschildren}}
 {{^haschildren}}
-    <li data-key="{{key}}" class="nav-item {{#menuclasses}}{{.}} {{/menuclasses}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
-        {{#istablist}}
-            {{#is_action_link}}
-                <a role="tab" class="nav-link {{#classes}}{{.}} {{/classes}}" href="{{tab}}" data-toggle="tab" data-text="{{{text}}}" data-disableactive="true" tabindex="-1"
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                    {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                >
-                    {{{text}}}
-                </a>
-                {{#action_link_actions}}
-                    {{> core/actions }}
-                {{/action_link_actions}}
-            {{/is_action_link}}
-            {{^is_action_link}}
-                <a role="tab" class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
-                    href="{{tab}}" data-toggle="tab" data-text="{{{text}}}"
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                    {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                    {{#isactive}}aria-selected="true"{{/isactive}}
-                    {{^isactive}}tabindex="-1"{{/isactive}}
-                >
-                    {{{text}}}
-                </a>
-            {{/is_action_link}}
-        {{/istablist}}
-        {{^istablist}}
-            {{#is_action_link}}
-                <a role="menuitem" class="nav-link {{#itemdata.classes}}{{.}} {{/itemdata.classes}} {{#classes}}{{.}} {{/classes}}" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}"
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                    {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                    data-disableactive="true" tabindex="-1"
-                >
-                    {{{text}}}
-                </a>
-                {{#action_link_actions}}
-                    {{> core/actions }}
-                {{/action_link_actions}}
-            {{/is_action_link}}
-            {{^is_action_link}}
-                <a role="menuitem" class="nav-link {{#itemdata.classes}}{{.}} {{/itemdata.classes}} {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
-                    href="{{{url}}}{{{action}}}"
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
-                    {{#attributes}}{{name}}="{{value}}" {{/attributes}}
-                    {{#isactive}}aria-current="true"{{/isactive}}
-                    {{^isactive}}tabindex="-1"{{/isactive}}
-                >
-                    {{{text}}}
-                </a>
-            {{/is_action_link}}
-        {{/istablist}}
-    </li>
+    {{#istablist}}
+        {{#is_action_link}}
+            <a role="tab" class="nav-link {{#classes}}{{.}} {{/classes}}" href="{{tab}}" data-toggle="tab" data-text="{{{text}}}" data-disableactive="true" tabindex="-1"
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+            >
+                {{{text}}}
+            </a>
+            {{#action_link_actions}}
+                {{> core/actions }}
+            {{/action_link_actions}}
+        {{/is_action_link}}
+        {{^is_action_link}}
+            <a role="tab" class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
+                href="{{tab}}" data-toggle="tab" data-text="{{{text}}}"
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+                {{#isactive}}aria-selected="true"{{/isactive}}
+                {{^isactive}}tabindex="-1"{{/isactive}}
+            >
+                {{{text}}}
+            </a>
+        {{/is_action_link}}
+    {{/istablist}}
+    {{^istablist}}
+        {{#is_action_link}}
+            <a {{^hidemenuitemrole}} role="menuitem" {{/hidemenuitemrole}} class="nav-link {{#itemdata.classes}}{{.}} {{/itemdata.classes}} {{#classes}}{{.}} {{/classes}}" {{#actionattributes}}{{name}}="{{value}}" {{/actionattributes}} href="{{{url}}}{{{action}}}"
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+                data-disableactive="true" tabindex="-1"
+            >
+                {{{text}}}
+            </a>
+            {{#action_link_actions}}
+                {{> core/actions }}
+            {{/action_link_actions}}
+        {{/is_action_link}}
+        {{^is_action_link}}
+            <a {{^hidemenuitemrole}} role="menuitem" {{/hidemenuitemrole}} class="nav-link {{#itemdata.classes}}{{.}} {{/itemdata.classes}} {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
+                href="{{{url}}}{{{action}}}"
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}{{^tooltip}}{{#title}}title="{{.}}"{{/title}}{{/tooltip}}
+                {{#attributes}}{{name}}="{{value}}" {{/attributes}}
+                {{#isactive}}aria-current="true"{{/isactive}}
+                {{^isactive}}tabindex="-1"{{/isactive}}
+            >
+                {{{text}}}
+            </a>
+        {{/is_action_link}}
+    {{/istablist}}
 {{/haschildren}}
diff --git a/templates/core/user_action_menu_items.mustache b/templates/core/user_action_menu_items.mustache
index c87d660b484..64a1a35b320 100644
--- a/templates/core/user_action_menu_items.mustache
+++ b/templates/core/user_action_menu_items.mustache
@@ -26,11 +26,13 @@
           * url - The href for the link.
           * pixicon - (Optional) The Moodle icon to use
           * imgsrc - (Optional) If provided, uses this as source for an image tag. Note: pixicon is preferred.
+          * hidemenuitemrole - (Not available) Only for example context to fix the CI warnings.
         * submenulink - If a submenu link is provided render it.
           * submenuid - The id of the targeted submenu.
           * title - The text to be shown for the link.
           * pixicon - (Optional) The Moodle icon to use.
           * imgsrc - (Optional) If provided, uses this as source for an image tag. Note: pixicon is preferred.
+          * hidemenuitemrole - (Not available) Only for example context to fix the CI warnings on role attribute.
         * divider - Whether a divider is to be displayed or not
 
     Example context (json):
@@ -41,7 +43,8 @@
                     "title": "Github user",
                     "url": "https://raw.githubusercontent.com/",
                     "pixicon": "t/dashboard",
-                    "imgsrc": "https://raw.githubusercontent.com/moodle/moodle/master/pix/t/check.png"
+                    "imgsrc": "https://raw.githubusercontent.com/moodle/moodle/master/pix/t/check.png",
+                    "hidemenuitemrole": true
                 },
                 "divider": 1
             },
@@ -50,7 +53,8 @@
                     "title": "Title",
                     "submenuid": "86cebd87",
                     "pixicon": "t/dashboard",
-                    "imgsrc": "https://raw.githubusercontent.com/moodle/moodle/master/pix/t/check.png"
+                    "imgsrc": "https://raw.githubusercontent.com/moodle/moodle/master/pix/t/check.png",
+                    "hidemenuitemrole": true
                 },
                 "divider": 1
             }
@@ -69,7 +73,7 @@
 }}
 {{#items}}
     {{#link}}
-        <a href="{{{url}}}" class="dropdown-item {{#menuclasses}} {{.}} {{/menuclasses}}" role="menuitem" tabindex="-1" {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} {{#attributes}}{{#name}}{{name}}="{{value}}"{{/name}} {{/attributes}}>
+        <a href="{{{url}}}" class="dropdown-item {{#menuclasses}} {{.}} {{/menuclasses}}" {{^hidemenuitemrole}} role="menuitem" {{/hidemenuitemrole}} tabindex="-1" {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} {{#attributes}}{{#name}}{{name}}="{{value}}"{{/name}} {{/attributes}}>
             {{#pixicon}}
                 {{#pix}}{{pixicon}}{{/pix}}
             {{/pixicon}}
@@ -80,7 +84,7 @@
         </a>
     {{/link}}
     {{#submenulink}}
-        <a href="#" class="carousel-navigation-link dropdown-item {{#menuclasses}} {{.}} {{/menuclasses}}" role="menuitem" tabindex="-1" data-carousel-target-id="carousel-item-{{submenuid}}" {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
+        <a href="#" class="carousel-navigation-link dropdown-item {{#menuclasses}} {{.}} {{/menuclasses}}" {{^hidemenuitemrole}} role="menuitem" {{/hidemenuitemrole}} tabindex="-1" data-carousel-target-id="carousel-item-{{submenuid}}" {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
         {{#attributes}}{{#name}}{{name}}="{{value}}"{{/name}}{{/attributes}}>
             {{#pixicon}}
                 {{#pix}}{{pixicon}}{{/pix}}
diff --git a/templates/core/user_action_menu_submenu_items.mustache b/templates/core/user_action_menu_submenu_items.mustache
index 65abe952b5e..8e068a0fc54 100644
--- a/templates/core/user_action_menu_submenu_items.mustache
+++ b/templates/core/user_action_menu_submenu_items.mustache
@@ -26,6 +26,7 @@
         * text - The text to be shown for the link.
         * url - The href for the link.
         * isactive - (Optional) Whether the item is currently active (has been selected).
+        * hidemenuitemrole - (Not available) Only for example context to fix the CI warnings on role attribute.
 
     Example context (json):
     {
@@ -34,7 +35,8 @@
                 "title": "Submenu item 1",
                 "text": "Submenu item 1",
                 "url": "https://example.com/",
-                "isactive": 0
+                "isactive": 0,
+                "hidemenuitemrole": true
             }
         }
     }
@@ -50,7 +52,7 @@
 }}
 {{#items}}
     {{#haschildren}}
-        <a href="#" class="carousel-navigation-link {{#itemdata.classes}} {{.}} {{/itemdata.classes}} dropdown-item pl-5" role="menuitem" {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} tabindex="1" data-carousel-target-id="carousel-item-{{submenuid}}">
+        <a href="#" class="carousel-navigation-link {{#itemdata.classes}} {{.}} {{/itemdata.classes}} dropdown-item pl-5" {{^hidemenuitemrole}}role="menuitem"{{/hidemenuitemrole}} {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} tabindex="1" data-carousel-target-id="carousel-item-{{submenuid}}">
             {{#pixicon}}
                 {{#pix}}{{pixicon}}{{/pix}}
             {{/pixicon}}
@@ -63,7 +65,7 @@
 
     {{^haschildren}}
         {{#link}}
-            <a href="{{{url}}}" class="dropdown-item {{#itemdata.classes}} {{.}} {{/itemdata.classes}} pl-5" role="menuitem" tabindex="-1" {{#isactive}}aria-current="true"{{/isactive}}
+            <a href="{{{url}}}" class="dropdown-item {{#itemdata.classes}} {{.}} {{/itemdata.classes}} pl-5" {{^hidemenuitemrole}}role="menuitem"{{/hidemenuitemrole}} tabindex="-1" {{#isactive}}aria-current="true"{{/isactive}}
                 {{#attributes}}{{#key}}{{key}}="{{value}}" {{/key}} {{#name}}{{name}}="{{value}}"{{/name}} {{/attributes}}
                 {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}>
                 {{{text}}}
diff --git a/templates/smartmenus-cardmenu-children.mustache b/templates/smartmenus-cardmenu-children.mustache
index cbfd42bc969..c896092364f 100644
--- a/templates/smartmenus-cardmenu-children.mustache
+++ b/templates/smartmenus-cardmenu-children.mustache
@@ -28,87 +28,80 @@
         "text": "Moodle community",
         "children": "",
         "title": "Moodle community",
-        "url": "https://moodle.org"
+        "url": "https://moodle.org",
+        "hidemenuitem": true
     }
 }}
 {{#haschildren}}
-    <li class="dropdown nav-item {{#card}} card-dropdown {{/card}} {{#menudata.classes}} {{.}} {{/menudata.classes}}" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
-        <a class="dropdown-toggle nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}} {{#menu.cssclass}} {{menu.cssclass}}{{/menu.cssclass}}" id="drop-down-{{moremenuid}}" role="menuitem" data-toggle="dropdown"
-            aria-haspopup="true" aria-expanded="false" href="#" aria-controls="drop-down-menu-{{moremenuid}}"
-            {{#isactive}}aria-current="true"{{/isactive}}
-            {{^isactive}}tabindex="-1"{{/isactive}}
-        >
-            {{{text}}}
-        </a>
-        <div class="dropdown-menu" role="menu" id="drop-down-menu-{{moremenuid}}" aria-labelledby="drop-down-{{moremenuid}}">
-            {{#helpicon}} <div class="menu-helpicon"> {{{helpicon}}} </div> {{/helpicon}}
-            {{#abovehelptext}} <div class="menu-description"> {{{helptext}}} </div> {{/abovehelptext}}
-
-            <div class="card-block-wrapper">
-                {{#children}}
-                    {{^divider}}
-                        <div class="card-block {{#itemdata.classes}} {{.}} {{/itemdata.classes}} ">
-                            <a href="{{{url}}}{{{action}}}">
-                                <span class="card-item-overlay"></span>
-                            </a>
-                            <div class="img-block">
-                                <a href="{{{url}}}{{{action}}}"><img src="{{{itemimage}}}" alt="" role="presentation"></a>
-                            </div>
-                            <div class="content-block"
-                                style="{{#itemdata.backgroundcolor}}background-color:{{{itemdata.backgroundcolor}}};{{/itemdata.backgroundcolor}}">
+    <a class="dropdown-toggle nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}} {{#menu.cssclass}} {{menu.cssclass}}{{/menu.cssclass}}"  id="drop-down-{{moremenuid}}" {{^hidemenuitem}} role="menuitem" {{/hidemenuitem}} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#" aria-controls="drop-down-menu-{{moremenuid}}"
+        {{#isactive}} aria-current="true" {{/isactive}} {{^isactive}} tabindex="-1" {{/isactive}}>
+        {{{text}}}
+    </a>
+    <div class="dropdown-menu" role="menu" id="drop-down-menu-{{moremenuid}}" aria-labelledby="drop-down-{{moremenuid}}">
+        {{#helpicon}} <div class="menu-helpicon"> {{{helpicon}}} </div> {{/helpicon}}
+        {{#abovehelptext}} <div class="menu-description"> {{{helptext}}} </div> {{/abovehelptext}}
+        <div class="card-block-wrapper">
+            {{#children}}
+                {{^divider}}
+                    <div class="card-block {{#itemdata.classes}} {{.}} {{/itemdata.classes}} ">
+                        <a href="{{{url}}}{{{action}}}">
+                            <span class="card-item-overlay"></span>
+                        </a>
+                        <div class="img-block">
+                            <a href="{{{url}}}{{{action}}}"><img src="{{{itemimage}}}" alt="" role="presentation"></a>
+                        </div>
+                        <div class="content-block"
+                            style="{{#itemdata.backgroundcolor}}background-color:{{{itemdata.backgroundcolor}}};{{/itemdata.backgroundcolor}}">
 
-                                <h5>
-                                    {{^is_action_link}}
-                                        <a class="dropdown-item menu-item-{{itemtype}} " {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1" {{#attributes}}{{name}}="{{value}}"{{/attributes}} style="{{#itemdata.textcolor}} color:{{{itemdata.textcolor}}};{{/itemdata.textcolor}}">{{{text}}}</a>
-                                    {{/is_action_link}}
-                                </h5>
+                            <h5>
                                 {{^is_action_link}}
-                                <div class="btn-block">
-                                    <a class="dropdown-item " role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
-                                        <i class="fa fa-long-arrow-right"></i>
-                                    </a>
-                                </div>
+                                    <a class="dropdown-item menu-item-{{itemtype}} " {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}} role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1" {{#attributes}}{{name}}="{{value}}"{{/attributes}} style="{{#itemdata.textcolor}} color:{{{itemdata.textcolor}}};{{/itemdata.textcolor}}">{{{text}}}</a>
                                 {{/is_action_link}}
+                            </h5>
+                            {{^is_action_link}}
+                            <div class="btn-block">
+                                <a class="dropdown-item " role="menuitem" href="{{{url}}}{{{action}}}" {{#isactive}}aria-current="true"{{/isactive}} tabindex="-1" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+                                    <i class="fa fa-long-arrow-right"></i>
+                                </a>
                             </div>
+                            {{/is_action_link}}
                         </div>
-                    {{/divider}}
-                    {{#divider}}
-                        <div class="dropdown-divider"></div>
-                    {{/divider}}
-                {{/children}}
-            </div>
-
-            {{#belowhelptext}} <div class="menu-description">{{{helptext}}}</div> {{/belowhelptext}}
+                    </div>
+                {{/divider}}
+                {{#divider}}
+                    <div class="dropdown-divider"></div>
+                {{/divider}}
+            {{/children}}
         </div>
-    </li>
+
+        {{#belowhelptext}} <div class="menu-description">{{{helptext}}}</div> {{/belowhelptext}}
+    </div>
 {{/haschildren}}
 {{^haschildren}}
-    <li data-key="{{key}}" class="nav-item" role="none" data-forceintomoremenu="{{#forceintomoremenu}}true{{/forceintomoremenu}}{{^forceintomoremenu}}false{{/forceintomoremenu}}">
-        {{#istablist}}
-            {{^is_action_link}}
-                <a role="tab" class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
-                    href="{{tab}}" data-toggle="tab" data-text="{{{text}}}"
-                    {{#isactive}}aria-selected="true"{{/isactive}}
-                    {{^isactive}}tabindex="-1"{{/isactive}}
-                    {{#attributes}}{{name}}="{{value}}"{{/attributes}}
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
-                >
-                    {{{text}}}
-                </a>
-            {{/is_action_link}}
-        {{/istablist}}
-        {{^istablist}}
-            {{^is_action_link}}
-                <a role="menuitem" class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
-                    href="{{{url}}}{{{action}}}"
-                    {{#isactive}}aria-current="true"{{/isactive}}
-                    {{^isactive}}tabindex="-1"{{/isactive}}
-                    {{#attributes}}{{name}}="{{value}}"{{/attributes}}
-                    {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
-                >
-                    {{{text}}}
-                </a>
-            {{/is_action_link}}
-        {{/istablist}}
-    </li>
+    {{#istablist}}
+        {{^is_action_link}}
+            <a role="tab" class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
+                href="{{tab}}" data-toggle="tab" data-text="{{{text}}}"
+                {{#isactive}}aria-selected="true"{{/isactive}}
+                {{^isactive}}tabindex="-1"{{/isactive}}
+                {{#attributes}}{{name}}="{{value}}"{{/attributes}}
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
+            >
+                {{{text}}}
+            </a>
+        {{/is_action_link}}
+    {{/istablist}}
+    {{^istablist}}
+        {{^is_action_link}}
+            <a {{^hidemenuitem}} role="menuitem" {{/hidemenuitem}} class="nav-link {{#isactive}}active{{/isactive}} {{#classes}}{{.}} {{/classes}}"
+                href="{{{url}}}{{{action}}}"
+                {{#isactive}}aria-current="true"{{/isactive}}
+                {{^isactive}}tabindex="-1"{{/isactive}}
+                {{#attributes}}{{name}}="{{value}}"{{/attributes}}
+                {{#tooltip}}title="{{.}}" data-toggle="tooltip"{{/tooltip}}
+            >
+                {{{text}}}
+            </a>
+        {{/is_action_link}}
+    {{/istablist}}
 {{/haschildren}}