diff --git a/src/Forms/GridField/GridFieldConfig_RecordEditor.php b/src/Forms/GridField/GridFieldConfig_RecordEditor.php
index 6c53a8a..298d8eb 100644
--- a/src/Forms/GridField/GridFieldConfig_RecordEditor.php
+++ b/src/Forms/GridField/GridFieldConfig_RecordEditor.php
@@ -10,7 +10,7 @@ class GridFieldConfig_RecordEditor extends GridFieldGridFieldConfig_RecordEditor
 {
     public function __construct($itemsPerPage = null)
     {
-        parent::__construct();
+        parent::__construct($itemsPerPage);
 
         $this->removeComponentsByType([
             GridField_ActionMenu::class,
diff --git a/src/Forms/GridField/GridFieldConfig_RelationEditor.php b/src/Forms/GridField/GridFieldConfig_RelationEditor.php
index 8def1cb..29dd7a1 100644
--- a/src/Forms/GridField/GridFieldConfig_RelationEditor.php
+++ b/src/Forms/GridField/GridFieldConfig_RelationEditor.php
@@ -10,7 +10,7 @@ class GridFieldConfig_RelationEditor extends GridFieldGridFieldConfig_RelationEd
 {
     public function __construct($itemsPerPage = null, $showPagination = null, $showAdd = null)
     {
-        parent::__construct();
+        parent::__construct($itemsPerPage, $showPagination, $showAdd);
 
         $this->removeComponentsByType([
             GridField_ActionMenu::class,
diff --git a/templates/A2nt/CMSNiceties/Widgets/SubmenuWidget.ss b/templates/A2nt/CMSNiceties/Widgets/SubmenuWidget.ss
index bfb4240..4df7c2f 100755
--- a/templates/A2nt/CMSNiceties/Widgets/SubmenuWidget.ss
+++ b/templates/A2nt/CMSNiceties/Widgets/SubmenuWidget.ss
@@ -1,14 +1,25 @@
 <% if $Submenu %>
     <nav>
         <ul class="nav flex-column">
-        	<% with $Page.Level(1) %>
-        	    <li class="nav-item-level1 nav-item {$CSSClass} $ExtraClass">
-			        <b class="nav-link">
-			            $MenuTitle.XML
-			            <% if $isCurrent || $isSection %><i class="visually-hidden">(current)</i><% end_if %>
-			        </b>
-			    </li>
-        	<% end_with %>
+        	<% if $TopLevelSubmenu %>
+                <% with $Page.Level(1) %>
+                    <li class="nav-item-level1 nav-item {$CSSClass} $ExtraClass">
+                        <b class="nav-link">
+                            $MenuTitle.XML
+                            <% if $isCurrent || $isSection %><i class="visually-hidden">(current)</i><% end_if %>
+                        </b>
+                    </li>
+                <% end_with %>
+            <% else %>
+                <% with $Page %>
+                    <li class="nav-item-level1 nav-item {$CSSClass} $ExtraClass">
+                        <b class="nav-link">
+                            $MenuTitle.XML
+                            <% if $isCurrent || $isSection %><i class="visually-hidden">(current)</i><% end_if %>
+                        </b>
+                    </li>
+                <% end_with %>
+            <% end_if %>
 
             <% loop $Submenu %>
                 <% include NavItem %>