diff --git a/.idea/codeception.xml b/.idea/codeception.xml
index 42a91a8..b101d83 100644
--- a/.idea/codeception.xml
+++ b/.idea/codeception.xml
@@ -33,6 +33,9 @@
         <Configuration>
           <option name="path" value="$PROJECT_DIR$/tests" />
         </Configuration>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/tests" />
+        </Configuration>
       </list>
     </option>
   </component>
diff --git a/.idea/futtern.iml b/.idea/futtern.iml
index 8702762..16f64df 100644
--- a/.idea/futtern.iml
+++ b/.idea/futtern.iml
@@ -4,6 +4,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="App\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/dealerdirect/phpcodesniffer-composer-installer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/lubiana/code-quality" />
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
index 8b8e568..551d4e1 100644
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -32,6 +32,9 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Controller/FoodOrderController.php b/src/Controller/FoodOrderController.php
index ad1b2f8..0fc4296 100644
--- a/src/Controller/FoodOrderController.php
+++ b/src/Controller/FoodOrderController.php
@@ -88,7 +88,6 @@ class FoodOrderController extends AbstractController
             );
         }
 
-
         return $this->render('food_order/orderitem.html.twig', [
             'form' => $form,
             'extras' => $extraRepository->getUniqueNames(),
diff --git a/src/Form/MenuItemExtraType.php b/src/Form/MenuItemExtraType.php
new file mode 100644
index 0000000..ce6bd9e
--- /dev/null
+++ b/src/Form/MenuItemExtraType.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Form;
+
+use App\Entity\ItemExtra;
+use App\Entity\MenuItem;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class MenuItemExtraType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name');
+        $builder->add('customextra', TextType::class, [
+            'label' => 'Add a new extra option',
+            'mapped' => false,
+            'required' => false,
+            'attr' => ['list' => 'item-extra-list'],
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => ItemExtra::class,
+        ]);
+    }
+}
diff --git a/src/Form/OrderItemType.php b/src/Form/OrderItemType.php
index cb7ff04..13afa97 100644
--- a/src/Form/OrderItemType.php
+++ b/src/Form/OrderItemType.php
@@ -32,11 +32,6 @@ class OrderItemType extends AbstractType
                 'expanded' => true,
             ],
         );
-        $builder->add('customextra', TextType::class, [
-            'label' => 'Not yet know extras, seperated by comma',
-            'mapped' => false,
-            'attr' => ['datalist' => 'item-extra-list'],
-        ]);
     }
 
     #[Override]
diff --git a/templates/base.html.twig b/templates/base.html.twig
index b989963..3d9e9c6 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -5,11 +5,6 @@
         <title>{% block title %}Welcome!{% endblock %}</title>
         <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
         <link rel="stylesheet" href="/css/water.css">
-        {% block stylesheets %}
-        {% endblock %}
-
-        {% block javascripts %}
-        {% endblock %}
     </head>
     <body>
         <header>