diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ef07a0d..b9bd2fb 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-29T10:52:30.282144200Z">
+        <DropdownSelection timestamp="2026-03-24T11:30:25.894049082Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\danie\.android\avd\Medium_Phone.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=R52T605XE0L" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireAllInOne.kt b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireAllInOne.kt
index f1d5f24..fc6022e 100644
--- a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireAllInOne.kt
+++ b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireAllInOne.kt
@@ -47,6 +47,9 @@ class QuestionnaireAllInOne(private val questionnaireFileName: String) : Questio
     }
 
     private fun buildAllInOneUi() {
+        sections.clear()
+        setupComplete = false
+
         context.setContentView(R.layout.questionnaire_all_in_one)
 
         container = context.findViewById(R.id.questionContainer)
@@ -64,6 +67,8 @@ class QuestionnaireAllInOne(private val questionnaireFileName: String) : Questio
             (context as? MainActivity)?.finishQuestionnaire()
         }
 
+        setupLanguageSpinner(context.findViewById(R.id.langSpinner))
+
         val inflater = LayoutInflater.from(context)
 
         for ((idx, question) in questions.withIndex()) {
@@ -101,6 +106,33 @@ class QuestionnaireAllInOne(private val questionnaireFileName: String) : Questio
         }
     }
 
+    private fun setupLanguageSpinner(spinner: Spinner) {
+        val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, LANGUAGE_LABELS).apply {
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        }
+        spinner.adapter = adapter
+        spinner.setSelection(LANGUAGE_IDS.indexOf(languageID).coerceAtLeast(0))
+
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, v: View?, position: Int, id: Long) {
+                val newLang = LANGUAGE_IDS[position]
+                if (newLang == languageID) return
+                spinner.post { onLanguageChanged(newLang) }
+            }
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+    }
+
+    private fun onLanguageChanged(newLang: String) {
+        for (section in sections) {
+            if (section.card.visibility == View.VISIBLE) {
+                try { section.handler?.saveAnswer() } catch (_: Exception) {}
+            }
+        }
+        languageID = newLang
+        buildAllInOneUi()
+    }
+
     private fun createEmbeddedHandler(question: QuestionItem): QuestionHandler? {
         val noop = {}
         val noopId: (String) -> Unit = {}
diff --git a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireBase.kt b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireBase.kt
index 466f6d7..8952f72 100644
--- a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireBase.kt
+++ b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireBase.kt
@@ -40,6 +40,17 @@ abstract class QuestionnaireBase<T> {
     abstract fun startQuestionnaire()
     abstract fun showCurrentQuestion()
 
+    companion object {
+        val LANGUAGE_IDS = listOf(
+            "GERMAN", "ENGLISH", "FRENCH", "ROMANIAN", "ARABIC",
+            "POLISH", "TURKISH", "UKRAINIAN", "RUSSIAN", "SPANISH"
+        )
+        val LANGUAGE_LABELS = listOf(
+            "DE", "EN", "FR", "RO", "AR",
+            "PL", "TR", "UA", "RU", "ES"
+        )
+    }
+
     fun attach(activity: Activity, language: String) {
         this.context = activity
         this.languageID = language
diff --git a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireGeneric.kt b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireGeneric.kt
index 3e95693..c850aef 100644
--- a/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireGeneric.kt
+++ b/app/src/main/java/com/dano/test1/questionnaire/QuestionnaireGeneric.kt
@@ -1,8 +1,16 @@
 package com.dano.test1.questionnaire
 
+import android.view.Gravity
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.Spinner
+import androidx.core.content.ContextCompat
 import com.dano.test1.LocalizationHelper
 import com.dano.test1.R
+import com.dano.test1.utils.ViewUtils
 
 open class QuestionnaireGeneric(private val questionnaireFileName: String) : QuestionnaireBase<Unit>() {
 
@@ -39,6 +47,40 @@ open class QuestionnaireGeneric(private val questionnaireFileName: String) : Que
             } else {
                 showEmptyScreen()
             }
+
+            injectLanguageSpinner(layout)
+        }
+    }
+
+    private fun injectLanguageSpinner(layout: View) {
+        val container = layout as? FrameLayout ?: return
+
+        val spinner = Spinner(context)
+        val adapter = ArrayAdapter(context, android.R.layout.simple_spinner_item, LANGUAGE_LABELS).apply {
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        }
+        spinner.adapter = adapter
+        spinner.background = ContextCompat.getDrawable(context, R.drawable.bg_field_filled)
+        spinner.setSelection(LANGUAGE_IDS.indexOf(languageID).coerceAtLeast(0))
+
+        val margin = ViewUtils.dp(context, 10)
+        container.addView(
+            spinner,
+            FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                Gravity.TOP or Gravity.END
+            ).apply { setMargins(0, margin, margin, 0) }
+        )
+
+        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, v: View?, position: Int, id: Long) {
+                val newLang = LANGUAGE_IDS[position]
+                if (newLang == languageID) return
+                languageID = newLang
+                spinner.post { showCurrentQuestion() }
+            }
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
     }
 }
diff --git a/app/src/main/res/layout/questionnaire_all_in_one.xml b/app/src/main/res/layout/questionnaire_all_in_one.xml
index aa52995..b93634f 100644
--- a/app/src/main/res/layout/questionnaire_all_in_one.xml
+++ b/app/src/main/res/layout/questionnaire_all_in_one.xml
@@ -5,21 +5,45 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnBack"
-        android:layout_width="@dimen/nav_btn_size"
-        android:layout_height="@dimen/nav_btn_size"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        android:text=""
-        android:textAllCaps="false"
-        app:icon="@drawable/ic_chevron_left"
-        app:iconTint="@color/btn_nav_left_icon_tint"
-        app:iconSize="@dimen/nav_icon_size"
-        app:iconPadding="0dp"
-        app:cornerRadius="999dp"
-        app:backgroundTint="@color/btn_nav_left_tint"
-        app:rippleColor="@color/btn_nav_left_ripple" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:paddingTop="12dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnBack"
+            android:layout_width="@dimen/nav_btn_size"
+            android:layout_height="@dimen/nav_btn_size"
+            android:text=""
+            android:textAllCaps="false"
+            app:icon="@drawable/ic_chevron_left"
+            app:iconTint="@color/btn_nav_left_icon_tint"
+            app:iconSize="@dimen/nav_icon_size"
+            app:iconPadding="0dp"
+            app:cornerRadius="999dp"
+            app:backgroundTint="@color/btn_nav_left_tint"
+            app:rippleColor="@color/btn_nav_left_ripple" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <Spinner
+            android:id="@+id/langSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_field_filled"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp" />
+
+    </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollContainer"