diff --git a/frontend/src/i18n/locale/de.json b/frontend/src/i18n/locale/de.json
index 7d17dfc5..c8ed94cf 100644
--- a/frontend/src/i18n/locale/de.json
+++ b/frontend/src/i18n/locale/de.json
@@ -46,6 +46,5 @@
     "groups": "Gruppen",
     "learning-path": "Lernpfad",
     "choose-lp": "Einen lernpfad auswählen",
-    "filter-themes": "Filter nach Themen",
-    "search-lp": "Suche und Auswahl eines Lernpfads"
+    "choose-classes": "Klassen wählen"
 }
diff --git a/frontend/src/i18n/locale/en.json b/frontend/src/i18n/locale/en.json
index 75171d11..92ccb90b 100644
--- a/frontend/src/i18n/locale/en.json
+++ b/frontend/src/i18n/locale/en.json
@@ -46,6 +46,5 @@
     "groups": "Groups",
     "learning-path": "Learning path",
     "choose-lp": "Select a learning path",
-    "filter-themes": "Filter by themes",
-    "search-lp": "Search and select a learning path"
+    "choose-classes": "Select classes"
 }
diff --git a/frontend/src/i18n/locale/fr.json b/frontend/src/i18n/locale/fr.json
index 0cfbed6f..1fb59349 100644
--- a/frontend/src/i18n/locale/fr.json
+++ b/frontend/src/i18n/locale/fr.json
@@ -46,6 +46,5 @@
     "groups": "Groupes",
     "learning-path": "Parcours d'apprentissage",
     "choose-lp": "Choisis un parcours d'apprentissage",
-    "filter-themes": "Filtrer par thèmes",
-    "search-lp": "Cherche et sélectionne un parcours d'apprentissage"
+    "choose-classes": "Choisis des classes"
 }
diff --git a/frontend/src/i18n/locale/nl.json b/frontend/src/i18n/locale/nl.json
index 276481d3..1636300e 100644
--- a/frontend/src/i18n/locale/nl.json
+++ b/frontend/src/i18n/locale/nl.json
@@ -46,6 +46,5 @@
     "groups": "Groepen",
     "learning-path": "Leerpad",
     "choose-lp": "Kies een leerpad",
-    "filter-themes": "Filter op thema's",
-    "search-lp": "Zoek en selecteer een leerpad"
+    "choose-classes": "Kies klassen"
 }
diff --git a/frontend/src/views/assignments/CreateAssignment.vue b/frontend/src/views/assignments/CreateAssignment.vue
index 0edd86ba..d417e2e8 100644
--- a/frontend/src/views/assignments/CreateAssignment.vue
+++ b/frontend/src/views/assignments/CreateAssignment.vue
@@ -1,22 +1,15 @@
 <script setup lang="ts">
     import {useI18n} from "vue-i18n";
-    import {computed, onMounted, ref, shallowRef, watch} from "vue";
-    import {THEMESITEMS} from "@/utils/constants.ts";
+    import {computed, onMounted, ref, watch} from "vue";
 
     const {t, locale} = useI18n();
 
-    const step = ref(1);
-
     const language = ref(locale.value);
 
     // If this value is set to true, the search bar will display a "loading" animation
     const loading = ref(false);
     const searchQuery = ref("");
 
-    // These lists store all available and selected themes
-    const themeItems = ref(Object.keys(THEMESITEMS).slice(1));
-    const selectedThemes = shallowRef<string[]>([]);
-
     // Store all learning paths
     const allLearningPaths = ref([]);
 
@@ -26,6 +19,7 @@
     // The hruid and title of the currently selected learning path(TODO: use for post req)
     const selectedLearningPath = ref(null);
 
+    const selectedClasses = ref([]);
 
     // Fetch all learning paths initially
     async function fetchAllLearningPaths() {
@@ -50,6 +44,7 @@
         }
     }
 
+    // Re-fetch the learning paths when the language changes
     watch(
         () => locale.value,
         (newLocale) => {
@@ -57,136 +52,66 @@
             if (!["nl", "en"].includes(newLocale)) {
                 language.value = "en";
             }
-            fetchAllLearningPaths(); // Re-fetch the learning path data when language changes
+            fetchAllLearningPaths();
         },
-        { immediate: true }
+        {immediate: true}
     );
 
-    // Filter the learning paths based on selected themes
-    async function filterLearningPathsByThemes() {
-        if (selectedThemes.value.length === 0) {
-            // Show all the learning paths if no themes are selected
-            filteredLearningPaths.value = [...allLearningPaths.value];
-            return;
-        }
-
-        const learningPathHruids = new Set();
-
-        // Collect all themes categories that are selected
-        const themeCategories = new Set();
-        selectedThemes.value.forEach(theme => {
-            THEMESITEMS[theme]?.forEach(category => themeCategories.add(category));
-        });
-
-        //TODO: replace by function from controller
-        try {
-            // Fetch all theme data in parallel and wait for all to complete
-            const responses = await Promise.all(
-                Array.from(themeCategories).map(category =>
-                    fetch(`http://localhost:3000/api/theme/${category}?language=${language.value}`)
-                        .then(response => {
-                            if (!response.ok) throw new Error(`Error fetching ${category}`);
-                            return response.json();
-                        })
-                        .catch(error => {
-                            console.error(error);
-                            return []; // Return empty array on failure
-                        })
-                )
-            );
-
-            // Combine all received hruids and add them in a set
-            responses.forEach(data => {
-                data.forEach((lp: string ) => learningPathHruids.add(lp));
-            });
-
-
-            // Update filteredLearningPaths only after all requests complete
-            filteredLearningPaths.value = allLearningPaths.value.filter(lp =>
-                learningPathHruids.has(lp.hruid)
-            );
-
-        } catch (error) {
-            console.error("Error fetching themes:", error);
-        }
-    }
-
     const searchResults = computed(() => {
-        return filteredLearningPaths.value.filter(lp =>
+        return filteredLearningPaths.value.filter((lp: { hruid: string; title: string }) =>
             lp.title.toLowerCase().includes(searchQuery.value.toLowerCase())
         );
     });
 
+    const classes = computed(() => ["f", "r"]);
+
     // Fetch all learning paths on mount
     onMounted(fetchAllLearningPaths);
 
-    // Watch for theme selection changes and filter lerning paths per theme
-    watch(selectedThemes, filterLearningPathsByThemes);
-
-
 </script>
 
 <template>
     <div class="main-container">
         <h1 class="title">{{ t("new-assignment") }}</h1>
         <v-card class="form-card">
-            <v-stepper class="stepper-container" alt-labels :items="[t('learning-path'), t('classes'), t('groups')]"
-                       v-model="step" show-actions>
-                <template v-slot:item.1>
-                    <v-card :title="t('choose-lp')" flat>
-                        <v-container class="step-container">
-                            <v-card-text>
-                                <v-select
-                                    v-model="selectedThemes"
-                                    :items="themeItems.map(theme => ({ title: t(`theme-options.${theme}`), value: theme }))"
-                                    variant="solo"
-                                    :label="t('filter-themes')"
-                                    chips
-                                    multiple
-                                    deletable-chips
-                                    clearable
-                                ></v-select>
-                            </v-card-text>
+            <v-form class="form-container">
+                <v-container class="step-container">
+                    <v-card-text>
+                        <v-combobox
+                            v-model="selectedLearningPath"
+                            :items="searchResults"
+                            :label="t('choose-lp')"
+                            variant="solo"
+                            clearable
+                            hide-details
+                            density="compact"
+                            :loading="loading"
+                            append-inner-icon="mdi-magnify"
+                            item-title="title"
+                            item-value="value"
+                            :filter="(item, query: string) => item.title.toLowerCase().includes(query.toLowerCase())"
+                        ></v-combobox>
+                    </v-card-text>
 
-                            <v-card-text>
-                                <v-combobox
-                                    v-model="selectedLearningPath"
-                                    :items="searchResults"
-                                    :label="t('search-lp')"
-                                    variant="solo"
-                                    clearable
-                                    hide-details
-                                    density="compact"
-                                    :loading="loading"
-                                    append-inner-icon="mdi-magnify"
-                                    item-title="title"
-                                    item-value="value"
-                                    :filter="(item, query: string) => item.title.toLowerCase().includes(query.toLowerCase())"
-                                ></v-combobox>
-                            </v-card-text>
+                    <v-card-text>
+                        <v-combobox
+                            v-model="selectedClasses"
+                            :items="classes"
+                            :label="t('choose-classes')"
+                            variant="solo"
+                            clearable
+                            multiple
+                            hide-details
+                            chips
+                            append-inner-icon="mdi-magnify"
+                            item-title="title"
+                            item-value="value"
+                        ></v-combobox>
+                    </v-card-text>
 
-
-
-                        </v-container>
-                    </v-card>
-                </template>
-
-                <template>
-                    <v-card title="Select one or more classes" flat>
-                        <v-container class="step-container">
-                            <!-- Content for Step Two -->
-                        </v-container>
-                    </v-card>
-                </template>
-
-                <template>
-                    <v-card title="Step Three" flat>
-                        <v-container class="step-container">
-                            <!-- Content for Step Three -->
-                        </v-container>
-                    </v-card>
-                </template>
-            </v-stepper>
+                </v-container>
+                <v-btn class="mt-2" type="submit" block>Submit</v-btn>
+            </v-form>
         </v-card>
     </div>
 </template>
@@ -210,11 +135,11 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    width: 70%;
+    width: 55%;
     /*padding: 1%;*/
 }
 
-.stepper-container {
+.form-container {
     width: 100%;
     display: flex;
     flex-direction: column;
@@ -228,18 +153,21 @@
 }
 
 /* Responsive adjustments */
-@media (max-width: 650px) {
+@media (max-width: 1000px) {
     .form-card {
-        width: 95%;
+        width: 70%;
         padding: 1%;
     }
 
-    .v-stepper-header {
-        display: none; /* Hides step numbers on small screens */
-    }
-
     .step-container {
         min-height: 300px; /* Gives enough space */
     }
 }
+
+/* Responsive adjustments */
+@media (max-width: 700px) {
+    .form-card {
+        width: 95%;
+    }
+}
 </style>