diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml
index ec453bb..097137d 100644
--- a/app/.idea/misc.xml
+++ b/app/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
diff --git a/app/app/.idea/AndroidProjectSystem.xml b/app/app/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/app/app/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/app/.idea/other.xml b/app/app/.idea/caches/deviceStreaming.xml
similarity index 88%
rename from app/app/.idea/other.xml
rename to app/app/.idea/caches/deviceStreaming.xml
index 22069ff..22baa42 100644
--- a/app/app/.idea/other.xml
+++ b/app/app/.idea/caches/deviceStreaming.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="direct_access_persist.xml">
+  <component name="DeviceStreaming">
     <option name="deviceSelectionList">
       <list>
         <PersistentDeviceSelectionData>
@@ -8,6 +8,7 @@
           <option name="brand" value="DOCOMO" />
           <option name="codename" value="F01L" />
           <option name="id" value="F01L" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="FUJITSU" />
           <option name="name" value="F-01L" />
           <option name="screenDensity" value="360" />
@@ -19,6 +20,7 @@
           <option name="brand" value="OnePlus" />
           <option name="codename" value="OP5552L1" />
           <option name="id" value="OP5552L1" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="OnePlus" />
           <option name="name" value="CPH2415" />
           <option name="screenDensity" value="480" />
@@ -30,6 +32,7 @@
           <option name="brand" value="OPPO" />
           <option name="codename" value="OP573DL1" />
           <option name="id" value="OP573DL1" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="OPPO" />
           <option name="name" value="CPH2557" />
           <option name="screenDensity" value="480" />
@@ -41,6 +44,7 @@
           <option name="brand" value="DOCOMO" />
           <option name="codename" value="SH-01L" />
           <option name="id" value="SH-01L" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="SHARP" />
           <option name="name" value="AQUOS sense2 SH-01L" />
           <option name="screenDensity" value="480" />
@@ -51,7 +55,9 @@
           <option name="api" value="34" />
           <option name="brand" value="Lenovo" />
           <option name="codename" value="TB370FU" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="TB370FU" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Lenovo" />
           <option name="name" value="Tab P12" />
           <option name="screenDensity" value="340" />
@@ -63,17 +69,31 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="a15" />
           <option name="id" value="a15" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="A15" />
           <option name="screenDensity" value="450" />
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16x" />
+          <option name="id" value="a16x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="a35x" />
           <option name="id" value="a35x" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="A35" />
           <option name="screenDensity" value="450" />
@@ -85,6 +105,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="a51" />
           <option name="id" value="a51" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy A51" />
           <option name="screenDensity" value="420" />
@@ -96,6 +117,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="akita" />
           <option name="id" value="akita" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8a" />
           <option name="screenDensity" value="420" />
@@ -107,6 +129,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="arcfox" />
           <option name="id" value="arcfox" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="razr plus 2024" />
           <option name="screenDensity" value="360" />
@@ -118,6 +141,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="austin" />
           <option name="id" value="austin" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g 5G (2022)" />
           <option name="screenDensity" value="280" />
@@ -129,6 +153,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="b0q" />
           <option name="id" value="b0q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S22 Ultra" />
           <option name="screenDensity" value="600" />
@@ -140,6 +165,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="bluejay" />
           <option name="id" value="bluejay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 6a" />
           <option name="screenDensity" value="420" />
@@ -151,6 +177,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="caiman" />
           <option name="id" value="caiman" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro" />
           <option name="screenDensity" value="360" />
@@ -161,7 +188,9 @@
           <option name="api" value="34" />
           <option name="brand" value="google" />
           <option name="codename" value="comet" />
+          <option name="default" value="true" />
           <option name="id" value="comet" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro Fold" />
           <option name="screenDensity" value="390" />
@@ -173,6 +202,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="crownqlteue" />
           <option name="id" value="crownqlteue" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Note9" />
           <option name="screenDensity" value="420" />
@@ -184,6 +214,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="dm2q" />
           <option name="id" value="dm2q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="S23 Plus" />
           <option name="screenDensity" value="450" />
@@ -195,6 +226,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="dm3q" />
           <option name="id" value="dm3q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S23 Ultra" />
           <option name="screenDensity" value="600" />
@@ -205,7 +237,9 @@
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="e1q" />
+          <option name="default" value="true" />
           <option name="id" value="e1q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S24" />
           <option name="screenDensity" value="480" />
@@ -217,6 +251,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="e3q" />
           <option name="id" value="e3q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S24 Ultra" />
           <option name="screenDensity" value="450" />
@@ -228,6 +263,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="eos" />
           <option name="id" value="eos" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Eos" />
           <option name="screenDensity" value="320" />
@@ -239,6 +275,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix" />
           <option name="id" value="felix" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold" />
           <option name="screenDensity" value="420" />
@@ -250,6 +287,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix" />
           <option name="id" value="felix" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold" />
           <option name="screenDensity" value="420" />
@@ -261,6 +299,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="felix_camera" />
           <option name="id" value="felix_camera" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Fold (Camera-enabled)" />
           <option name="screenDensity" value="420" />
@@ -272,6 +311,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="fogona" />
           <option name="id" value="fogona" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g play - 2024" />
           <option name="screenDensity" value="280" />
@@ -283,6 +323,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="g0q" />
           <option name="id" value="g0q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-S906U1" />
           <option name="screenDensity" value="450" />
@@ -294,6 +335,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="gta9pwifi" />
           <option name="id" value="gta9pwifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-X210" />
           <option name="screenDensity" value="240" />
@@ -305,6 +347,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="gts7xllite" />
           <option name="id" value="gts7xllite" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-T738U" />
           <option name="screenDensity" value="340" />
@@ -315,7 +358,9 @@
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
           <option name="codename" value="gts8uwifi" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="gts8uwifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S8 Ultra" />
           <option name="screenDensity" value="320" />
@@ -326,7 +371,9 @@
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
           <option name="codename" value="gts8wifi" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="gts8wifi" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S8" />
           <option name="screenDensity" value="274" />
@@ -338,6 +385,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="gts9fe" />
           <option name="id" value="gts9fe" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Tab S9 FE 5G" />
           <option name="screenDensity" value="280" />
@@ -349,6 +397,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="husky" />
           <option name="id" value="husky" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8 Pro" />
           <option name="screenDensity" value="390" />
@@ -360,6 +409,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="java" />
           <option name="id" value="java" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="G20" />
           <option name="screenDensity" value="280" />
@@ -371,6 +421,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="komodo" />
           <option name="id" value="komodo" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9 Pro XL" />
           <option name="screenDensity" value="360" />
@@ -382,6 +433,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="lynx" />
           <option name="id" value="lynx" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 7a" />
           <option name="screenDensity" value="420" />
@@ -393,6 +445,7 @@
           <option name="brand" value="motorola" />
           <option name="codename" value="maui" />
           <option name="id" value="maui" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Motorola" />
           <option name="name" value="moto g play - 2023" />
           <option name="screenDensity" value="280" />
@@ -404,6 +457,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="o1q" />
           <option name="id" value="o1q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S21" />
           <option name="screenDensity" value="421" />
@@ -415,6 +469,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="oriole" />
           <option name="id" value="oriole" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 6" />
           <option name="screenDensity" value="420" />
@@ -426,6 +481,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="panther" />
           <option name="id" value="panther" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 7" />
           <option name="screenDensity" value="420" />
@@ -437,6 +493,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="q5q" />
           <option name="id" value="q5q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Z Fold5" />
           <option name="screenDensity" value="420" />
@@ -448,6 +505,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="q6q" />
           <option name="id" value="q6q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy Z Fold6" />
           <option name="screenDensity" value="420" />
@@ -458,7 +516,9 @@
           <option name="api" value="30" />
           <option name="brand" value="google" />
           <option name="codename" value="r11" />
+          <option name="formFactor" value="Wear OS" />
           <option name="id" value="r11" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Watch" />
           <option name="screenDensity" value="320" />
@@ -471,6 +531,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="r11q" />
           <option name="id" value="r11q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="SM-S711U" />
           <option name="screenDensity" value="450" />
@@ -482,6 +543,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="redfin" />
           <option name="id" value="redfin" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 5" />
           <option name="screenDensity" value="440" />
@@ -493,6 +555,7 @@
           <option name="brand" value="google" />
           <option name="codename" value="shiba" />
           <option name="id" value="shiba" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 8" />
           <option name="screenDensity" value="420" />
@@ -504,6 +567,7 @@
           <option name="brand" value="samsung" />
           <option name="codename" value="t2q" />
           <option name="id" value="t2q" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Samsung" />
           <option name="name" value="Galaxy S21 Plus" />
           <option name="screenDensity" value="394" />
@@ -514,7 +578,9 @@
           <option name="api" value="33" />
           <option name="brand" value="google" />
           <option name="codename" value="tangorpro" />
+          <option name="formFactor" value="Tablet" />
           <option name="id" value="tangorpro" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel Tablet" />
           <option name="screenDensity" value="320" />
@@ -525,7 +591,9 @@
           <option name="api" value="34" />
           <option name="brand" value="google" />
           <option name="codename" value="tokay" />
+          <option name="default" value="true" />
           <option name="id" value="tokay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9" />
           <option name="screenDensity" value="420" />
@@ -536,7 +604,9 @@
           <option name="api" value="35" />
           <option name="brand" value="google" />
           <option name="codename" value="tokay" />
+          <option name="default" value="true" />
           <option name="id" value="tokay" />
+          <option name="labId" value="google" />
           <option name="manufacturer" value="Google" />
           <option name="name" value="Pixel 9" />
           <option name="screenDensity" value="420" />
diff --git a/app/app/.idea/misc.xml b/app/app/.idea/misc.xml
index 3040d03..8bb1dd1 100644
--- a/app/app/.idea/misc.xml
+++ b/app/app/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager">
diff --git a/app/app/.idea/modules.xml b/app/app/.idea/modules.xml
new file mode 100644
index 0000000..8c4259d
--- /dev/null
+++ b/app/app/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/app/.idea/runConfigurations.xml b/app/app/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/app/app/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/CreateDishActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/CreateDishActivity.kt
index f26d8dc..d3038e4 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/CreateDishActivity.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/CreateDishActivity.kt
@@ -3,12 +3,14 @@ package tech.mercantec.easyeat
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
+import android.widget.ArrayAdapter
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Spinner
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContentProviderCompat.requireContext
 import tech.mercantec.easyeat.models.Ingredient
 
 class CreateDishActivity : AppCompatActivity() {
@@ -34,12 +36,13 @@ class CreateDishActivity : AppCompatActivity() {
         saveButton.setOnClickListener {
             val ingredientList = collectIngredients()
 
+            val name = findViewById<EditText>(R.id.dishName).text.toString().trim()
+            val description = findViewById<EditText>(R.id.dishDescription).text.toString().trim()
+            val instructions = findViewById<EditText>(R.id.instructions).text.toString().trim()
             // Debug/log example
             for (ingredient in ingredientList) {
                 Log.d("INGREDIENT", "Name: ${ingredient.Element}, Amount: ${ingredient.Amount}, Unit: ${ingredient.Unit}")
             }
-
-            // You can now save to DB, send to backend, etc.
         }
 
     }
@@ -47,9 +50,15 @@ class CreateDishActivity : AppCompatActivity() {
     private fun addIngredientRow() {
         val inflater = LayoutInflater.from(this)
         val ingredientRow = inflater.inflate(R.layout.activity_create_dish_ingredient_row, null)
+        val spinnerMeasurements = ingredientRow.findViewById<Spinner>(R.id.measurementsDropDown)
+        spinnerMeasurements.adapter = ArrayAdapter(
+            this,
+            android.R.layout.simple_spinner_item,
+            listOf("g", "kg", "ml", "l", "tsp", "tbsp", "cup", "pcs", "pinch", "dash")
+        )
 
         // Handle remove button in each row
-        val removeButton: Button = ingredientRow.findViewById(R.id.removeButton)
+        val removeButton: ImageButton = ingredientRow.findViewById(R.id.removeButton)
         removeButton.setOnClickListener {
             ingredientContainer.removeView(ingredientRow)
         }
@@ -64,11 +73,12 @@ class CreateDishActivity : AppCompatActivity() {
             val ingredientView = ingredientContainer.getChildAt(i)
 
             // Find views inside this ingredient row
-            val nameEditText = ingredientView.findViewById<EditText>(R.id.ingredientNameEditText)
-            val amountEditText = ingredientView.findViewById<EditText>(R.id.ingredientAmountEditText)
-            val spinner = ingredientView.findViewById<Spinner>(R.id.spinner)
 
-            val element = nameEditText.text.toString().trim()
+            val ingredientEditText = ingredientView.findViewById<EditText>(R.id.ingredientNameEditText)
+            val amountEditText = ingredientView.findViewById<EditText>(R.id.ingredientAmountEditText)
+            val spinner = ingredientView.findViewById<Spinner>(R.id.measurementsDropDown)
+
+            val element = ingredientEditText.text.toString().trim()
             val amount = amountEditText.text.toString().trim()
             val unit = spinner.selectedItem.toString()
 
diff --git a/app/app/src/main/res/drawable/edit_text_border.xml b/app/app/src/main/res/drawable/edit_text_border.xml
new file mode 100644
index 0000000..aad8276
--- /dev/null
+++ b/app/app/src/main/res/drawable/edit_text_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent"/>
+    <stroke android:width="1dp" android:color="#FF888888"/> <!-- Light gray border -->
+    <corners android:radius="4dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/activity_create_dish_form.xml b/app/app/src/main/res/layout/activity_create_dish_form.xml
index cfb4252..cf8dfb1 100644
--- a/app/app/src/main/res/layout/activity_create_dish_form.xml
+++ b/app/app/src/main/res/layout/activity_create_dish_form.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="8dp">
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -9,11 +12,40 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/create_dish_heading"
+        android:text="@string/general"
         android:textAlignment="center"
-        android:textSize="24sp" />
+        android:textSize="24sp"
+        android:layout_marginTop="20dp"/>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:text="Name" />
+
+    <EditText
+        android:id="@+id/dishName"
+        android:layout_width="match_parent"
+        android:layout_height="58dp" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:text="Description" />
+
+    <EditText
+        android:id="@+id/dishDescription"
+        android:layout_width="match_parent"
+        android:layout_height="58dp"/>
     <!-- Container for all ingredient rows -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/ingredients"
+        android:textAlignment="center"
+        android:textSize="24sp"
+        android:layout_marginTop="20dp"/>
+
     <LinearLayout
         android:id="@+id/ingredientContainer"
         android:layout_width="match_parent"
@@ -27,13 +59,31 @@
         android:text="Add Ingredient"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Instructions"
+        android:textAlignment="center"
+        android:textSize="24sp"
+        android:layout_marginTop="20dp"/>
+
+    <EditText
+        android:id="@+id/instructions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:gravity="start|top"
+        android:background="@drawable/edit_text_border"
+        android:inputType="textMultiLine"
+        android:visibility="visible"
+        android:height="80dp"/>
 
     <Button
         android:id="@+id/saveDishButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Save"
-        android:layout_gravity="right"
+        android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"/>
 </LinearLayout>
-
+</ScrollView>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/activity_create_dish_ingredient_row.xml b/app/app/src/main/res/layout/activity_create_dish_ingredient_row.xml
index 9235593..053740f 100644
--- a/app/app/src/main/res/layout/activity_create_dish_ingredient_row.xml
+++ b/app/app/src/main/res/layout/activity_create_dish_ingredient_row.xml
@@ -19,8 +19,7 @@
         <EditText
             android:id="@+id/ingredientNameEditText"
             android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:hint="Ingredient name" />
+            android:layout_height="58dp" />
 
         <!-- Row: Amount + Measurement -->
         <LinearLayout
@@ -62,20 +61,19 @@
                     android:text="@string/measurement_label" />
 
                 <Spinner
-                    android:id="@+id/spinner"
+                    android:id="@+id/measurementsDropDown"
                     android:layout_width="match_parent"
                     android:layout_height="48dp" />
             </LinearLayout>
 
             <!-- Remove Button -->
-            <Button
+            <ImageButton
                 android:id="@+id/removeButton"
                 android:layout_width="48dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:text="-"
-                android:textSize="20dp"
-                android:backgroundTint="@color/red" />
+                android:src="@android:drawable/ic_delete"
+                android:background="@android:color/transparent" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 47af1ac..96753c1 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -23,4 +23,7 @@
     <string name="add_label">Add</string>
     <string name="edit_profile_label">Edit profile</string>
     <string name="loading">Loading…</string>
+    <string name="general">General</string>
+    <string name="ingredients">Ingredients</string>
+    <string name="Instructions">Instructions</string>
 </resources>
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 7e9628f..1bff416 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.9.1"
+agp = "8.9.2"
 kotlin = "1.9.24"
 coreKtx = "1.10.1"
 junit = "4.13.2"