diff --git a/Configuration/TCA/tx_nlmenubuilder_domain_model_menuitem.php b/Configuration/TCA/tx_nlmenubuilder_domain_model_menuitem.php
index ed22529e5fcfdc24ed12806e6dda5d66aeebfdf0..81c4cfc0f22544bfc5f8eabeec700cce61db7cec 100644
--- a/Configuration/TCA/tx_nlmenubuilder_domain_model_menuitem.php
+++ b/Configuration/TCA/tx_nlmenubuilder_domain_model_menuitem.php
@@ -224,11 +224,19 @@ return [
             'exclude' => false,
             'label' => "$ll:tx_nlmenubuilder_domain_model_menuitem.page",
             'config' => [
-                'type' => 'input',
-                'renderType' => 'inputLink',
-                'size' => 30,
-                'eval' => 'trim,required',
-                'softref' => 'typolink',
+                'type' => 'group',
+                'internal_type' => 'db',
+                'allowed' => 'pages',
+                'maxitems' => 1,
+                'minitems' => 1,
+                'size' => 1,
+                'default' => 0,
+                'suggestOptions' => [
+                    'default' => [
+                        'additionalSearchFields' => 'nav_title, alias, url',
+                        'addWhere' => 'AND pages.doktype IN (1, 3, 4)'
+                    ]
+                ]
             ],
         ],
         'link' => [
@@ -236,8 +244,16 @@ return [
             'label' => "$ll:tx_nlmenubuilder_domain_model_menuitem.link",
             'config' => [
                 'type' => 'input',
+                'renderType' => 'inputLink',
                 'size' => 30,
-                'eval' => 'trim,required'
+                'eval' => 'required',
+                'fieldControl' => [
+                    'linkPopup' => [
+                        'options' => [
+                            'blindLinkOptions' => 'page'
+                        ],
+                    ]
+                ]
             ],
         ],
         'content' => [
@@ -262,10 +278,14 @@ return [
             'exclude' => true,
             'label' => "$ll:tx_nlmenubuilder_domain_model_menuitem.submenu",
             'config' => [
-                'type' => 'inline',
+                'type' => 'selectMultipleSideBySide',
                 'foreign_table' => 'tx_nlmenubuilder_domain_model_menu',
                 'foreign_field' => 'menuitem',
-                'maxitems' => 9999,
+                'size' => 10,
+                'autoSizeMax' => 30,
+                'minitems' => 1,
+                'maxitems' => 1,
+                'multiple' => 0,
                 'appearance' => [
                     'collapseAll' => 0,
                     'levelLinksPosition' => 'top',
@@ -273,6 +293,17 @@ return [
                     'showPossibleLocalizationRecords' => 1,
                     'showAllLocalizationLink' => 1
                 ],
+                'fieldControl' => [
+                    'editPopup' => [
+                        'disabled' => false,
+                    ],
+                    'addRecord' => [
+                        'disabled' => false,
+                    ],
+                    'listModule' => [
+                        'disabled' => true,
+                    ],
+                ],
             ],
 
         ],