diff --git a/backend/model/icalModel.go b/backend/model/icalModel.go
index 4cfa1b1..192a528 100644
--- a/backend/model/icalModel.go
+++ b/backend/model/icalModel.go
@@ -23,7 +23,7 @@ type Entry struct {
 type Entries []*Entry
 
 type FeedCollection struct {
-	Name            string `db:"Name" json:"Name"`
-	Course          string `db:"course" json:"Course"`
-	UserDefinedName string `db:"userDefinedName" json:"UserDefinedName"`
+	Name            string `db:"Name" json:"name"`
+	Course          string `db:"course" json:"course"`
+	UserDefinedName string `db:"userDefinedName" json:"userDefinedName"`
 }
diff --git a/frontend/src/api/createFeed.ts b/frontend/src/api/createFeed.ts
index 1667331..5c20240 100644
--- a/frontend/src/api/createFeed.ts
+++ b/frontend/src/api/createFeed.ts
@@ -18,3 +18,21 @@ export async function createIndividualFeed(modules: Module[]): Promise<string> {
     });
   return token;
 }
+
+export async function saveIndividualFeed(token: string, modules: Module[]): Promise<string> {
+
+  await fetch("/api/collections/feeds/records/" + token, {
+    method: "PATCH",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: "{\"modules\":" + JSON.stringify(modules) + "}",
+  })
+    .then((response) => {
+      return response.json();
+    })
+    .then((response) => {
+      token = response;
+    });
+  return token;
+}
diff --git a/frontend/src/components/AdditionalModules.vue b/frontend/src/components/AdditionalModules.vue
index f1843a7..6894bf6 100644
--- a/frontend/src/components/AdditionalModules.vue
+++ b/frontend/src/components/AdditionalModules.vue
@@ -38,7 +38,6 @@ const ModuleInformation = defineAsyncComponent(
   () => import("./ModuleInformation.vue"),
 );
 
-//TODO add missing module prop informations for ModuleInformation.vue
 async function showInfo(moduleName : string) {
 
   const module: Ref<Module> = ref(new Module("", "", "", "", "", []));
diff --git a/frontend/src/components/ModuleSelection.vue b/frontend/src/components/ModuleSelection.vue
index 446df5d..0bfee03 100644
--- a/frontend/src/components/ModuleSelection.vue
+++ b/frontend/src/components/ModuleSelection.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, PropType, Ref, ref, watch } from "vue";
+import { computed, ComputedRef, PropType, Ref, ref, watch } from "vue";
 import { Module } from "../model/module.ts";
 import moduleStore from "../store/moduleStore";
 import router from "../router";
@@ -11,24 +11,27 @@ const props = defineProps({
   },
 });
 
+type ModuleWithSelection = { module: Module; selected: boolean };
+
 // array of modules with boolean if selected with getter and setter
-const modulesWithSelection: Ref<{ module: Module; selected: boolean }[]> = ref(
-  props.modules.map((module) => {
-    return { module: module, selected: false };
+const modulesWithSelection: Ref<ModuleWithSelection[]> = ref(
+  props.modules.map((propModule) => {
+    return { module: propModule, selected: moduleStore().modules.some((module: Module) =>
+        module.isEqual ? module.isEqual(propModule) : false,
+      ), };
   }),
 );
 
-//watch for changes in modules prop and update modulesWithSelection
-
-function selectedModules(): Module[] {
-  return modulesWithSelection.value
+const selectedModules: ComputedRef<Module[]> = computed(() =>
+  modulesWithSelection.value
     .filter((module) => module.selected)
-    .map((module) => module.module);
-}
+    .map((module) => module.module),
+);
 
 const currentModules = computed(() => props.modules);
 
 function selectAllModules(selection: boolean) {
+  console.debug(props.modules);
   modulesWithSelection.value.forEach((module) => {
     module.selected = selection;
   });
@@ -36,10 +39,6 @@ function selectAllModules(selection: boolean) {
 
 const allSelected: Ref<boolean> = ref(true);
 
-computed(() => {
-  return modulesWithSelection.value.every((module) => module.selected);
-});
-
 watch(currentModules, (newValue: Module[]) => {
   modulesWithSelection.value = newValue.map((module) => {
     return { module: module, selected: false };
@@ -47,33 +46,30 @@ watch(currentModules, (newValue: Module[]) => {
 });
 
 function nextStep() {
-  console.log("next step");
-  selectedModules().forEach((module) => {
+  selectedModules.value.forEach((module: Module) => {
     moduleStore().addModule(module);
   });
 
-  console.debug(moduleStore().modules);
-
   router.push("/additional-modules");
 }
 </script>
 
 <template>
-  <div class="flex flex-column card-container">
+  <div class="flex flex-column card-container mx-8 mt-2">
     <div class="flex align-items-center justify-content-center mb-3">
       <Button
-        :disabled="selectedModules().length < 1"
+        :disabled="selectedModules.length < 1"
         class="col-4 justify-content-center"
         @click="nextStep()"
         >Next Step
       </Button>
     </div>
     <div class="flex align-items-center justify-content-center">
-      <DataView :value="modulesWithSelection" data-key="name">
+      <DataView :value="modulesWithSelection" data-key="module">
         <template #header>
           <div class="flex justify-content-between flex-wrap">
             <div class="flex align-items-center justify-content-center">
-              <h3>Modules - {{ selectedModules().length }}</h3>
+              <h3>Modules - {{ selectedModules.length }}</h3>
             </div>
             <div class="flex align-items-center justify-content-center">
               <ToggleButton
@@ -96,20 +92,18 @@ function nextStep() {
         <template #list="slotProps">
           <div class="col-12">
             <div
-              class="flex flex-column xl:flex-row xl:align-items-start p-4 gap-4"
+              class="flex flex-column xl:flex-row xl:align-items-start p-2 gap-4"
             >
               <div
-                class="flex flex-column sm:flex-row justify-content-between align-items-center xl:align-items-start flex-1 gap-4"
+                class="flex flex-column sm:flex-row justify-content-between align-items-center flex-1 gap-4"
               >
                 <div
-                  class="flex flex-column align-items-center sm:align-items-start gap-3"
+                  class="flex flex-column align-items-center justify-content-center sm:align-items-start gap-3"
                 >
-                  <div class="text-2xl">
-                    {{ slotProps.data.module.name }}
-                  </div>
+                  <p class="text-lg">{{ slotProps.data.module.name }}</p>
                 </div>
                 <div
-                  class="flex sm:flex-column align-items-center sm:align-items-end gap-3 sm:gap-2"
+                  class="flex sm:flex-column justify-content-center sm:align-items-end gap-3 sm:gap-2"
                 >
                   <ToggleButton
                     v-model="modulesWithSelection[slotProps.index].selected"
@@ -135,4 +129,4 @@ function nextStep() {
     width: 50rem;
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/editCalendar/EditAdditionalModules.vue b/frontend/src/components/editCalendar/EditAdditionalModules.vue
new file mode 100644
index 0000000..7563600
--- /dev/null
+++ b/frontend/src/components/editCalendar/EditAdditionalModules.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import { defineAsyncComponent, ref, Ref } from "vue";
+import { Module } from "../../model/module";
+import { fetchAllModules } from "../../api/fetchCourse";
+import moduleStore from "../../store/moduleStore";
+import { MultiSelectAllChangeEvent } from "primevue/multiselect";
+import router from "../../router";
+import { fetchModule } from "../../api/fetchModule";
+import { useDialog } from "primevue/usedialog";
+const dialog = useDialog();
+
+const fetchedModules = async () => {
+  return await fetchAllModules();
+};
+
+const modules: Ref<Module[]> = ref([]);
+
+const selectedModules: Ref<Module[]> = ref([] as Module[]);
+
+fetchedModules().then(
+  (data) =>
+    (modules.value = data.map((module: Module) => {
+      return module;
+    })),
+);
+
+async function nextStep() {
+  selectedModules.value.forEach((module: Module) => {
+    moduleStore().addModule(module);
+  });
+
+  await router.push("/edit-calendar");
+}
+
+const ModuleInformation = defineAsyncComponent(
+  () => import("../ModuleInformation.vue"),
+);
+
+async function showInfo(moduleName : string) {
+
+  const module: Ref<Module> = ref(new Module("", "", "", "", "", []));
+  await fetchModule(moduleName).then((data) => {
+     module.value = data;
+  });
+  dialog.open(ModuleInformation, {
+    props: {
+      style: {
+        width: "50vw",
+      },
+      breakpoints: {
+        "960px": "75vw",
+        "640px": "90vw",
+      },
+      modal: true,
+    },
+    data: {
+      module: module,
+    },
+  });
+}
+
+const display = (module: Module) => module.name + " (" + module.course + ")";
+
+const selectAll = ref(false);
+
+const onSelectAllChange = (event: MultiSelectAllChangeEvent) => {
+  selectedModules.value = event.checked
+    ? modules.value.map((module) => module)
+    : [];
+  selectAll.value = event.checked;
+};
+
+function selectChange() {
+  selectAll.value = selectedModules.value.length === modules.value.length;
+}
+</script>
+
+<template>
+  <div class="flex flex-column">
+    <div class="flex align-items-center justify-content-center h-4rem m-2">
+      <h3>
+        Select additional Modules that are not listed in the regular semester
+        for your Course
+      </h3>
+    </div>
+    <div class="card flex align-items-center justify-content-center m-2">
+      <MultiSelect
+        v-model="selectedModules"
+        :max-selected-labels="1"
+        :option-label="display"
+        :options="modules"
+        :select-all="selectAll"
+        :virtual-scroller-options="{ itemSize: 70 }"
+        class="custom-multiselect"
+        filter
+        placeholder="Select additional modules"
+        @change="selectChange()"
+        @selectall-change="onSelectAllChange($event)"
+      >
+        <template #option="slotProps">
+          <div class="flex justify-content-between w-full">
+            <div class="flex align-items-center justify-content-center">
+              <p class="text-1xl white-space-normal p-mb-0">
+                {{ display(slotProps.option) }}
+              </p>
+            </div>
+            <div class="flex align-items-center justify-content-center ml-2">
+              <Button
+                icon="pi pi-info"
+                severity="secondary"
+                rounded
+                outlined
+                aria-label="Information"
+                @click.stop="showInfo(slotProps.option.name)"
+              ></Button>
+              <DynamicDialog />
+            </div>
+          </div>
+        </template>
+        <template #footer>
+          <div class="py-2 px-3">
+            <b>{{ selectedModules ? selectedModules.length : 0 }}</b>
+            item{{
+              (selectedModules ? selectedModules.length : 0) > 1 ? "s" : ""
+            }}
+            selected.
+          </div>
+        </template>
+      </MultiSelect>
+    </div>
+    <div class="flex align-items-center justify-content-center h-4rem m-2">
+      <Button @click="nextStep()">Next Step</Button>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+:deep(.custom-multiselect) {
+  width: 50rem;
+}
+
+:deep(.custom-multiselect li) {
+  height: unset;
+}
+</style>
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
new file mode 100644
index 0000000..45b4e66
--- /dev/null
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup>
+import {
+  computed,
+  Ref,
+  ref,
+} from "vue";
+import { Module } from "../../model/module";
+import moduleStore from "../../store/moduleStore";
+import { fetchAllModules } from "../../api/fetchCourse";
+import { createIndividualFeed, saveIndividualFeed } from "../../api/createFeed.ts";
+import tokenStore from "../../store/tokenStore.ts";
+import router from "../../router";
+
+const tableData = computed(() =>
+  moduleStore().modules.map((module: Module) => {
+    return {
+      Course: module.course,
+      Module: module,
+    };
+  }),
+);
+
+const columns = ref([
+  { field: "Course", header: "Course" },
+  { field: "Module", header: "Module" },
+]);
+
+const fetchedModules = async () => {
+  return await fetchAllModules();
+};
+
+function deleteAllModules() {
+  moduleStore().removeAllModules();
+}
+
+function deleteModule(module: Module) {
+  console.debug(module);
+  moduleStore().removeModule(module);
+}
+
+const modules: Ref<Module[]> = ref([]);
+
+fetchedModules().then(
+  (data) =>
+    (modules.value = data.map((module: Module) => {
+      return module;
+    })),
+);
+
+async function finalStep() {
+  await saveIndividualFeed(tokenStore().token, moduleStore().modules);
+  await router.push("/calendar-link");
+}
+</script>
+
+<template>
+  <div class="flex flex-column card-container mx-8 mt-2">
+    <div class="flex align-items-center justify-content-center border-round m-2">
+      <DataTable
+        :value="tableData"
+        editMode="cell"
+        tableClass="editable-cells-table"
+        responsiveLayout="scroll"
+      >
+        <Column
+          v-for="col of columns"
+          :key="col.field"
+          :field="col.field"
+          :header="col.header"
+        >
+          <template #body="{ data, field }">
+            <div>
+              {{field === "Module" ? data[field].userDefinedName : data[field]}}
+            </div>
+          </template>
+          <template #editor="{ data, field }">
+            <template v-if="field !== 'Module'">
+              <div>{{ data[field] }}</div>
+            </template>
+            <template v-else>
+              <InputText
+                class="w-full"
+                v-model="data[field].userDefinedName"
+                autofocus
+              />
+            </template>
+          </template>
+        </Column>
+        <Column>
+          <template #body="{ data }">
+            <Button
+              @click="deleteModule(data['Module'])"
+              icon="pi pi-trash"
+              severity="danger"
+              outlined
+              rounded
+              aria-label="Cancel"
+            />
+          </template>
+        </Column>
+      </DataTable>
+    </div>
+    <div class="flex align-items-center justify-content-center border-round m-2">
+      <Button label="Save Calendar" @click="finalStep()" />
+    </div>
+  </div>
+</template>
+
+<style scoped>
+@media screen and (min-width: 962px) {
+  .empty-message {
+    width: 50rem;
+  }
+}
+</style>
diff --git a/frontend/src/components/editCalendar/loadCalender.vue b/frontend/src/components/editCalendar/loadCalender.vue
deleted file mode 100644
index 84a8508..0000000
--- a/frontend/src/components/editCalendar/loadCalender.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<script setup lang="ts">
-
-import { ref, Ref } from "vue";
-import moduleStore from "../../store/moduleStore";
-import { getCalender } from "../../api/loadCalendar";
-
-const token: Ref<string> = ref("");
-
-
-function loadCalendar() {
-  moduleStore().removeAllModules();
-
-  getCalender(token.value).then((data) => {
-    console.log(data);
-    data.forEach((module) => {
-      moduleStore().addModule(module);
-    });
-  });
-}
-</script>
-
-<template>
-  <div class="flex flex-column">
-    <div class="flex align-items-center justify-content-center h-4rem border-round">
-      <p class="text-2xl">Please enter your existing calendar token</p>
-    </div>
-    <div class="flex align-items-center justify-content-center border-round m-2">
-      <InputText type="text" v-model="token" />
-    </div>
-    <div class="flex align-items-center justify-content-center border-round m-2">
-      <Button label="Load Calendar" @click="loadCalendar" />
-  </div>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/frontend/src/model/module.ts b/frontend/src/model/module.ts
index 1cb0cd5..edc0911 100644
--- a/frontend/src/model/module.ts
+++ b/frontend/src/model/module.ts
@@ -9,4 +9,13 @@ export class Module {
     public semester: string,
     public events: Event[] = [],
   ) {}
+
+  isEqual(module: Module): Boolean{
+    return (
+      this.name === module.name &&
+      this.course === module.course
+    );
+  }
 }
+
+
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index ac75df0..c57fa93 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -7,6 +7,8 @@ import Imprint from "../components/Imprint.vue";
 import PrivacyPolicy from "../components/PrivacyPolicy.vue";
 import RenameModules from "../components/RenameModules.vue";
 import EditCalendarView from "../view/editCalendarView.vue";
+import EditAdditionalModules from "../components/editCalendar/EditAdditionalModules.vue";
+import EditModules from "../components/editCalendar/EditModules.vue";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -26,6 +28,16 @@ const router = createRouter({
       name: "additional-modules",
       component: AdditionalModules,
     },
+    {
+      path: "/edit-additional-modules",
+      name: "edit-additional-modules",
+      component: EditAdditionalModules,
+    },
+    {
+      path: "/edit-calendar",
+      name: "edit-calendar",
+      component: EditModules,
+    },
     {
       path: "/calendar-link",
       name: "calendar-link",
diff --git a/frontend/src/view/editCalendarView.vue b/frontend/src/view/editCalendarView.vue
index 1d02d97..ec9a831 100644
--- a/frontend/src/view/editCalendarView.vue
+++ b/frontend/src/view/editCalendarView.vue
@@ -1,9 +1,28 @@
 <script setup lang="ts">
 
-import LoadCalender from "../components/editCalendar/loadCalender.vue";
+import { Ref, ref } from "vue";
+import { Module } from "../model/module";
+import moduleStore from "../store/moduleStore";
+import { getCalender } from "../api/loadCalendar";
+import router from "../router";
+import tokenStore from "../store/tokenStore";
 
+const token: Ref<string> = ref("");
+const modules: Ref<Module[]> = ref(moduleStore().modules);
 
+function loadCalendar() {
+  moduleStore().removeAllModules();
+  tokenStore().setToken(token.value);
 
+  getCalender(token.value).then((data) => {
+    data.forEach((module) => {
+      moduleStore().addModule(module);
+    });
+    modules.value = data;
+  });
+
+  router.push("/edit-additional-modules")
+}
 </script>
 
 <template>
@@ -11,8 +30,14 @@ import LoadCalender from "../components/editCalendar/loadCalender.vue";
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
       <h3 class="text-2xl">Edit your HTWKalender <i class="pi pi-calendar vertical-align-baseline" style="font-size: 2rem"></i></h3>
     </div>
-    <div class="flex align-items-center justify-content-center">
-      <LoadCalender />
+    <div class="flex align-items-center justify-content-center h-4rem border-round">
+      <p class="text-2xl">Please enter your existing calendar token</p>
+    </div>
+    <div class="flex align-items-center justify-content-center border-round m-2">
+      <InputText type="text" v-model="token" />
+    </div>
+    <div class="flex align-items-center justify-content-center border-round m-2">
+      <Button label="Load Calendar" @click="loadCalendar" />
     </div>
   </div>
 </template>