diff --git a/client/src/components/modules/ModuleFilter.vue b/client/src/components/modules/ModuleFilter.vue
index f851d225..5f952422 100644
--- a/client/src/components/modules/ModuleFilter.vue
+++ b/client/src/components/modules/ModuleFilter.vue
@@ -1,18 +1,23 @@
 <template>
   <div class="module-filter">
     <div class="module-filter__filterselection">
-      <ModuleFilterDropdown class="module-filter__dropdown"
+      <Dropdown class="module-filter__dropdown"
                             :selected-item="selectedCategory"
                             :items="firstLevelCategories"
                             @update:selectedItem="newItem => selectedCategory = newItem"
-      ></ModuleFilterDropdown>
+      ></Dropdown>
 
-      <ModuleFilterDropdown
+      <Dropdown
         class="module-filter__dropdown"
         :selected-item="selectedLernfeld"
-                            :items="lernfeldOptions"
-                            @update:selectedItem="newItem => selectedLernfeld = newItem"
-      ></ModuleFilterDropdown>
+        :items="lernfeldOptions"
+        @update:selectedItem="newItem => selectedLernfeld = newItem"
+      ></Dropdown>
+      <pill-radio-buttons :selectableItems="languageOptions"
+                         :defaultSelectedItem="initialLanguage"
+                         class="module-filter__language-selection"
+      @update:selectedItem="item => selectedLanguage = item"/>
+
     </div>
     <div class="topic__modules">
       <module-teaser
@@ -31,14 +36,27 @@
   import ModuleTeaser from "@/components/modules/ModuleTeaser.vue";
   import gql from "graphql-tag";
   import {useQuery, useMutation} from "@vue/apollo-composable";
-  import ModuleFilterDropdown from "@/components/modules/ModuleFilterDropdown.vue";
+  import Dropdown from "@/components/ui/Dropdown.vue";
+  import PillRadioButtons from "@/components/ui/PillRadioButtons.vue";
+
+  // TODO: Fix console warnings... onBeforeUnmount is called when there is no active component instance to be associated with.
+  // TODO: Improve Typing
 
 
   const props = defineProps<{
-    modules: Object;
+    modules: Array<Object>;
     me: any;
   }>();
 
+  const languageOptions: Array<{ id: number, label: string }> = ref([
+    {id: 1, label: 'De'},
+    {id: 2, label: 'Fr'},
+    {id: 3, label: 'En'}
+  ])
+  const initialLanguage = languageOptions.value[0]
+
+  const selectedLanguage = ref(initialLanguage)
+
 
   const {result: moduleCategoriesResult} = useQuery(gql`
     query ModuleCategoriesQuery {
@@ -86,8 +104,6 @@
     return filterModules();
   });
 
-  // "$flavor.textInstrumentFilterShowAll"
-
   function loadDefaultCategory(me) {
     return me?.lastModuleCategory || nullCategory;
   }
@@ -115,14 +131,18 @@
       });
     }
     updateLastModuleCategory(selectedCategory.value);
+      filteredModules  = filterByLanguage(selectedLanguage.value, filteredModules);
 
     return filteredModules;
+  }
 
-
+  function filterByLanguage(language: Object, modules: Object) {
+    console.log("selectedLanguage", selectedLanguage.value);
+    return modules
   }
 
 
-  function updateLastModuleCategory(moduleCategory) {
+  function updateLastModuleCategory(moduleCategory: Object) {
     console.log(moduleCategory);
 
     const {mutate: updateLastModuleCategory} = useMutation(gql`
@@ -150,58 +170,65 @@
   @import 'styles/helpers';
 
   .module-filter {
+    // TODO: how do I correcty set the with of the whole thig including the grid for the modules?
+    width: 75%;
 
     &__filterselection {
+      @include desktop;
+
       display: flex;
       flex-wrap: wrap;
-
+      justify-content: space-between;
     }
+
     &__dropdown {
       margin-right: 20px;
-      width: 100%;
-      @include desktop {
-        width: 300px;
-      }
+      width: 300px;
+
     }
 
-    &__module-filter {
-      width: 100%;
-    }
+    &__language-selection {
+      margin-left: auto;
 
-    .topic {
-      display: grid;
-      padding: $large-spacing $small-spacing;
-      @include desktop {
-        padding: $large-spacing 0;
-      }
-      grid-template-columns: 1fr;
-      @include desktop {
-        grid-template-columns: 300px 1fr;
-      }
-
-
-      &__modules {
-        margin-top: 40px;
-        display: flex;
-        flex-wrap: wrap;
-        @supports (display: grid) {
-          display: grid;
-        }
-        grid-column-gap: $large-spacing;
-        grid-row-gap: $large-spacing;
-
-        @include desktop {
-          grid-template-columns: repeat(3, minmax(auto, 380px));
-        }
-      }
-
-
-      &__teaser {
-        color: $color-charcoal-dark;
-        width: 90%;
-        @include lead-paragraph;
-        margin-bottom: $large-spacing;
-      }
     }
   }
+
+
+  .topic {
+    display: grid;
+    padding: $large-spacing $small-spacing;
+    @include desktop {
+      padding: $large-spacing 0;
+    }
+    grid-template-columns: 1fr;
+    @include desktop {
+      grid-template-columns: 300px 1fr;
+    }
+
+
+    &__modules {
+      margin-top: 40px;
+      display: flex;
+      flex-wrap: wrap;
+      @supports (display: grid) {
+        display: grid;
+      }
+      grid-column-gap: $large-spacing;
+      grid-row-gap: $large-spacing;
+
+      @include desktop {
+        grid-template-columns: repeat(3, minmax(auto, 380px));
+      }
+    }
+
+
+    &__teaser {
+      color: $color-charcoal-dark;
+      width: 90%;
+      @include lead-paragraph;
+      margin-bottom: $large-spacing;
+    }
+  }
+
+
 </style>
diff --git a/client/src/components/modules/ModuleFilterDropdown.vue b/client/src/components/ui/Dropdown.vue
similarity index 94%
rename from client/src/components/modules/ModuleFilterDropdown.vue
rename to client/src/components/ui/Dropdown.vue
index 1124c09f..6f01b39f 100644
--- a/client/src/components/modules/ModuleFilterDropdown.vue
+++ b/client/src/components/ui/Dropdown.vue
@@ -27,8 +27,7 @@
           v-for="item in items"
           :key="item.id"
           @click="updateSelectedItem(item)"
-        >
-          <i v-if="selectedItem === item">A</i><span>{{ item.name }}</span>
+        ><span>{{ item.name }}</span>
         </li>
 
 
@@ -43,7 +42,6 @@
   import ChevronDown from "@/components/icons/ChevronDown.vue";
 
   const props = defineProps<{
-    mobile: boolean,
     selectedItem: Object,
     items: Object[],
   }>();
@@ -55,7 +53,6 @@
   }
 
   function updateSelectedItem(item: Object) {
-    console.log('updateSelectedItem', item);
     emit('update:selectedItem', item);
     showPopover.value = false;
   }
@@ -118,6 +115,7 @@
   .widget-popover {
     width: 100%;
     border-radius: 12px;
+    margin-top: 4px;
 
     .popover-links__link {
       &:hover {
diff --git a/client/src/components/modules/PillradioButton.vue b/client/src/components/ui/PillRadioButtons.vue
similarity index 61%
rename from client/src/components/modules/PillradioButton.vue
rename to client/src/components/ui/PillRadioButtons.vue
index b4538619..15ae447a 100644
--- a/client/src/components/modules/PillradioButton.vue
+++ b/client/src/components/ui/PillRadioButtons.vue
@@ -1,48 +1,36 @@
 <template>
   <div class="pill-radio">
     <button
-      :class="['pill-radio__button', { 'pill-radio__button--active': item.id === selectedId }]"
-      v-for="item in items"
+      :class="['pill-radio__button', { 'pill-radio__button--active': item === selectedItem }]"
+      v-for="item in props.selectableItems"
       :key="item.id"
-      @click="selectButton(item.id)"
+      @click="updateSelectedItem(item)"
     >
       {{ item.label }}
     </button>
   </div>
 </template>
 
-<script lang="ts" setup>
-  import {ref, watch, PropType} from 'vue';
+<script setup lang="ts">
+  import {ref} from 'vue';
 
+  const emit = defineEmits(['update:selectedItem']);
 
-  // const { items } = defineProps({
-  //   items: {
-  //     type: Array as PropType<{ id: number; label: string }[]>,
-  //     required: true
-  //   }
-  // });
+  const props = defineProps<{
+    selectableItems: Object;
+    defaultSelectedItem: Object;
+  }>();
 
+  const selectedItem = ref(props.defaultSelectedItem)
 
-  const items = ref([
-    {id: 1, label: 'De'},
-    {id: 2, label: 'Fr'},
-    {id: 3, label: 'En'}
-  ])
-
-
-  const selectedId = ref(1)
-
-
-  function selectButton(id: number) {
-    selectedId.value = id
+  function updateSelectedItem(item: object) {
+    emit('update:selectedItem', item);
+    selectedItem.value = item
   }
 
-
 </script>
 
 <style scoped lang="scss">
-
-
   .pill-radio {
     display: flex;
     overflow: hidden;