diff --git a/Configuration/TCA/Addition.php b/Configuration/TCA/Addition.php
index e573abb..e470f26 100644
--- a/Configuration/TCA/Addition.php
+++ b/Configuration/TCA/Addition.php
@@ -7,7 +7,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_addition'] = [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title',
     ],
     'types' => [
-        '1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, title,--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,starttime, endtime'],
+        '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime'],
     ],
     'palettes' => [
         '1' => ['showitem' => ''],
@@ -18,6 +18,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_addition'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
@@ -32,6 +33,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_addition'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'items' => [
                     ['', 0],
                 ],
diff --git a/Configuration/TCA/TeaBeverage.php b/Configuration/TCA/TeaBeverage.php
index c5a2a3d..88cfc10 100644
--- a/Configuration/TCA/TeaBeverage.php
+++ b/Configuration/TCA/TeaBeverage.php
@@ -7,7 +7,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teabeverage'] = [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, size, type, additions, testimonials',
     ],
     'types' => [
-        '1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, size, type, additions, testimonials,--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,starttime, endtime'],
+        '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, size, type, additions, testimonials, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime'],
     ],
     'palettes' => [
         '1' => ['showitem' => ''],
@@ -18,6 +18,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teabeverage'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
@@ -32,6 +33,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teabeverage'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'items' => [
                     ['', 0],
                 ],
@@ -105,6 +107,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teabeverage'] = [
             'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_teabeverage.type',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'foreign_table' => 'tx_tea_domain_model_teatype',
                 'minitems' => 0,
                 'maxitems' => 1,
@@ -115,35 +118,13 @@ $GLOBALS['TCA']['tx_tea_domain_model_teabeverage'] = [
             'label' => 'LLL:EXT:tea/Resources/Private/Language/locallang_db.xlf:tx_tea_domain_model_teabeverage.additions',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingleBox',
                 'foreign_table' => 'tx_tea_domain_model_addition',
                 'MM' => 'tx_tea_teabeverage_addition_mm',
                 'size' => 10,
                 'autoSizeMax' => 30,
                 'maxitems' => 9999,
                 'multiple' => 0,
-                'wizards' => [
-                    '_PADDING' => 1,
-                    '_VERTICAL' => 1,
-                    'edit' => [
-                        'type' => 'popup',
-                        'title' => 'Edit',
-                        'script' => 'wizard_edit.php',
-                        'icon' => 'edit2.gif',
-                        'popup_onlyOpenIfSelected' => 1,
-                        'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1',
-                    ],
-                    'add' => [
-                        'type' => 'script',
-                        'title' => 'Create new',
-                        'icon' => 'add.gif',
-                        'params' => [
-                            'table' => 'tx_tea_domain_model_addition',
-                            'pid' => '###CURRENT_PID###',
-                            'setValue' => 'prepend'
-                        ],
-                        'script' => 'wizard_add.php',
-                    ],
-                ],
             ],
         ],
         'testimonials' => [
diff --git a/Configuration/TCA/TeaType.php b/Configuration/TCA/TeaType.php
index 3c510d5..c68b074 100644
--- a/Configuration/TCA/TeaType.php
+++ b/Configuration/TCA/TeaType.php
@@ -7,7 +7,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teatype'] = [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, caffeinated',
     ],
     'types' => [
-        '1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, title, caffeinated,--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,starttime, endtime'],
+        '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden title, caffeinated, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime'],
     ],
     'palettes' => [
         '1' => ['showitem' => ''],
@@ -18,6 +18,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teatype'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
@@ -32,6 +33,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_teatype'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'items' => [
                     ['', 0],
                 ],
diff --git a/Configuration/TCA/Testimonial.php b/Configuration/TCA/Testimonial.php
index 7ef0947..dd9a48a 100644
--- a/Configuration/TCA/Testimonial.php
+++ b/Configuration/TCA/Testimonial.php
@@ -7,7 +7,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_testimonial'] = [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, date_of_posting, number_of_consumed_cups, text',
     ],
     'types' => [
-        '1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, date_of_posting, number_of_consumed_cups, text,--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,starttime, endtime'],
+        '1' => ['showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, date_of_posting, number_of_consumed_cups, text, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime'],
     ],
     'palettes' => [
         '1' => ['showitem' => ''],
@@ -18,6 +18,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_testimonial'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
                 'items' => [
@@ -32,6 +33,7 @@ $GLOBALS['TCA']['tx_tea_domain_model_testimonial'] = [
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
+                'renderType' => 'selectSingle',
                 'items' => [
                     ['', 0],
                 ],