diff --git a/legalconsenthub/components/FormEngine.vue b/legalconsenthub/components/FormEngine.vue
index 2ef190c..17a669b 100644
--- a/legalconsenthub/components/FormEngine.vue
+++ b/legalconsenthub/components/FormEngine.vue
@@ -1,11 +1,14 @@
 <template>
-  <div v-for="(formElement, index) in props.modelValue" :key="formElement.id">
-    <component
-      :is="getResolvedComponent(formElement)"
-      :form-options="formElement.options"
-      @update:form-options="updateFormOptions($event, index)"
-    />
-  </div>
+  <template v-for="(formElement, index) in props.modelValue" :key="formElement.id">
+    <UFormField>
+      <component
+        :is="getResolvedComponent(formElement)"
+        :form-options="formElement.options"
+        @update:form-options="updateFormOptions($event, index)"
+      />
+    </UFormField>
+    <USeparator />
+  </template>
 </template>
 
 <script setup lang="ts">
diff --git a/legalconsenthub/composables/useApplicationForm.ts b/legalconsenthub/composables/applicationForm/useApplicationForm.ts
similarity index 97%
rename from legalconsenthub/composables/useApplicationForm.ts
rename to legalconsenthub/composables/applicationForm/useApplicationForm.ts
index dc615a9..6048008 100644
--- a/legalconsenthub/composables/useApplicationForm.ts
+++ b/legalconsenthub/composables/applicationForm/useApplicationForm.ts
@@ -4,6 +4,7 @@ import {
   type PagedApplicationFormDto,
   ResponseError
 } from '~/.api-client'
+import { useApplicationFormApi } from './useApplicationFormApi'
 
 const currentApplicationForm: Ref<ApplicationFormDto | undefined> = ref()
 
diff --git a/legalconsenthub/composables/useApplicationFormApi.ts b/legalconsenthub/composables/applicationForm/useApplicationFormApi.ts
similarity index 95%
rename from legalconsenthub/composables/useApplicationFormApi.ts
rename to legalconsenthub/composables/applicationForm/useApplicationFormApi.ts
index 7b7b324..a39fcb3 100644
--- a/legalconsenthub/composables/useApplicationFormApi.ts
+++ b/legalconsenthub/composables/applicationForm/useApplicationFormApi.ts
@@ -1,4 +1,4 @@
-import { ApplicationFormApi, Configuration } from '../.api-client'
+import { ApplicationFormApi, Configuration } from '../../.api-client'
 import type { CreateApplicationFormDto, ApplicationFormDto, PagedApplicationFormDto } from '~/.api-client'
 import { cleanDoubleSlashes, withoutTrailingSlash } from 'ufo'
 
diff --git a/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplate.ts b/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplate.ts
new file mode 100644
index 0000000..3246627
--- /dev/null
+++ b/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplate.ts
@@ -0,0 +1,97 @@
+import {
+  type CreateApplicationFormDto,
+  type ApplicationFormDto,
+  type PagedApplicationFormDto,
+  ResponseError
+} from '~/.api-client'
+import { useApplicationFormTemplateApi } from './useApplicationFormTemplateApi'
+
+const currentApplicationForm: Ref<ApplicationFormDto | undefined> = ref()
+
+export function useApplicationFormTemplate() {
+  const applicationFormApi = useApplicationFormTemplateApi()
+
+  async function createApplicationFormTemplate(
+    createApplicationFormDto: CreateApplicationFormDto
+  ): Promise<ApplicationFormDto> {
+    try {
+      currentApplicationForm.value = await applicationFormApi.createApplicationFormTemplate(createApplicationFormDto)
+      return currentApplicationForm.value
+    } catch (e: unknown) {
+      if (e instanceof ResponseError) {
+        console.error('Failed creating application form:', e.response)
+      } else {
+        console.error('Failed creating application form:', e)
+      }
+      return Promise.reject(e)
+    }
+  }
+
+  async function getAllApplicationFormTemplates(): Promise<PagedApplicationFormDto> {
+    try {
+      return await applicationFormApi.getAllApplicationFormTemplates()
+    } catch (e: unknown) {
+      if (e instanceof ResponseError) {
+        console.error('Failed retrieving application forms:', e.response)
+      } else {
+        console.error('Failed retrieving application forms:', e)
+      }
+      return Promise.reject(e)
+    }
+  }
+
+  async function getApplicationFormTemplateById(id: string): Promise<ApplicationFormDto> {
+    try {
+      return await applicationFormApi.getApplicationFormTemplateById(id)
+    } catch (e: unknown) {
+      if (e instanceof ResponseError) {
+        console.error(`Failed retrieving application form with ID ${id}:`, e.response)
+      } else {
+        console.error(`Failed retrieving application form with ID ${id}:`, e)
+      }
+      return Promise.reject(e)
+    }
+  }
+
+  async function updateApplicationFormTemplate(
+    id?: string,
+    applicationFormDto?: ApplicationFormDto
+  ): Promise<ApplicationFormDto> {
+    if (!id || !applicationFormDto) {
+      return Promise.reject(new Error('ID or application form DTO missing'))
+    }
+
+    try {
+      currentApplicationForm.value = await applicationFormApi.updateApplicationFormTemplate(id, applicationFormDto)
+      return currentApplicationForm.value
+    } catch (e: unknown) {
+      if (e instanceof ResponseError) {
+        console.error(`Failed updating application form with ID ${id}:`, e.response)
+      } else {
+        console.error(`Failed updating application form with ID ${id}:`, e)
+      }
+      return Promise.reject(e)
+    }
+  }
+
+  async function deleteApplicationFormTemplateById(id: string): Promise<void> {
+    try {
+      return await applicationFormApi.deleteApplicationFormTemplateById(id)
+    } catch (e: unknown) {
+      if (e instanceof ResponseError) {
+        console.error(`Failed deleting application form with ID ${id}:`, e.response)
+      } else {
+        console.error(`Failed deleting application form with ID ${id}:`, e)
+      }
+      return Promise.reject(e)
+    }
+  }
+
+  return {
+    createApplicationFormTemplate,
+    getAllApplicationFormTemplates,
+    getApplicationFormTemplateById,
+    updateApplicationFormTemplate,
+    deleteApplicationFormTemplateById
+  }
+}
diff --git a/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplateApi.ts b/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplateApi.ts
new file mode 100644
index 0000000..a693397
--- /dev/null
+++ b/legalconsenthub/composables/applicationFormTemplate/useApplicationFormTemplateApi.ts
@@ -0,0 +1,47 @@
+import { ApplicationFormTemplateApi, Configuration } from '../../.api-client'
+import type { CreateApplicationFormDto, ApplicationFormDto, PagedApplicationFormDto } from '~/.api-client'
+import { cleanDoubleSlashes, withoutTrailingSlash } from 'ufo'
+
+export function useApplicationFormTemplateApi() {
+  const appBaseUrl = useRuntimeConfig().app.baseURL
+  const { serverApiBaseUrl, serverApiBasePath, clientProxyBasePath } = useRuntimeConfig().public
+
+  const basePath = withoutTrailingSlash(
+    cleanDoubleSlashes(import.meta.client ? appBaseUrl + clientProxyBasePath : serverApiBaseUrl + serverApiBasePath)
+  )
+
+  const applicationFormApiClient = new ApplicationFormTemplateApi(new Configuration({ basePath }))
+
+  async function createApplicationFormTemplate(
+    createApplicationFormDto: CreateApplicationFormDto
+  ): Promise<ApplicationFormDto> {
+    return applicationFormApiClient.createApplicationFormTemplate({ createApplicationFormDto })
+  }
+
+  async function getAllApplicationFormTemplates(): Promise<PagedApplicationFormDto> {
+    return applicationFormApiClient.getAllApplicationFormTemplates()
+  }
+
+  async function getApplicationFormTemplateById(id: string): Promise<ApplicationFormDto> {
+    return applicationFormApiClient.getApplicationFormTemplateById({ id })
+  }
+
+  async function updateApplicationFormTemplate(
+    id: string,
+    applicationFormDto: ApplicationFormDto
+  ): Promise<ApplicationFormDto> {
+    return applicationFormApiClient.updateApplicationFormTemplate({ id, applicationFormDto })
+  }
+
+  async function deleteApplicationFormTemplateById(id: string): Promise<void> {
+    return applicationFormApiClient.deleteApplicationFormTemplate({ id })
+  }
+
+  return {
+    createApplicationFormTemplate,
+    getAllApplicationFormTemplates,
+    getApplicationFormTemplateById,
+    updateApplicationFormTemplate,
+    deleteApplicationFormTemplateById
+  }
+}
diff --git a/legalconsenthub/composables/index.ts b/legalconsenthub/composables/index.ts
new file mode 100644
index 0000000..c7b79df
--- /dev/null
+++ b/legalconsenthub/composables/index.ts
@@ -0,0 +1,2 @@
+export { useApplicationFormTemplate } from './applicationFormTemplate/useApplicationFormTemplate'
+export { useApplicationForm } from './applicationForm/useApplicationForm'
diff --git a/legalconsenthub/layouts/default.vue b/legalconsenthub/layouts/default.vue
index ea0c728..4369f56 100644
--- a/legalconsenthub/layouts/default.vue
+++ b/legalconsenthub/layouts/default.vue
@@ -8,6 +8,12 @@
       class="bg-(--ui-bg-elevated)/25"
       :ui="{ footer: 'lg:border-t lg:border-(--ui-border)' }"
     >
+      <template #header>
+        <NuxtLink to="/">
+          <img src="../public/favicon.ico" alt="Logo" />
+        </NuxtLink>
+      </template>
+
       <template #default="{ collapsed }">
         <UDashboardSearchButton :collapsed="collapsed" class="bg-transparent ring-(--ui-border)" />
 
diff --git a/legalconsenthub/pages/create.vue b/legalconsenthub/pages/create.vue
index 22a8feb..0b0d433 100644
--- a/legalconsenthub/pages/create.vue
+++ b/legalconsenthub/pages/create.vue
@@ -6,15 +6,7 @@
           <UDashboardSidebarCollapse />
         </template>
 
-        <template #right>
-          <UTooltip text="Notifications" :shortcuts="['N']">
-            <UButton color="neutral" variant="ghost" square>
-              <UChip color="error" inset>
-                <UIcon name="i-lucide-bell" class="size-5 shrink-0" />
-              </UChip>
-            </UButton>
-          </UTooltip>
-        </template>
+        <template #right />
       </UDashboardNavbar>
 
       <UDashboardToolbar>
@@ -23,11 +15,18 @@
     </template>
 
     <template #body>
-      Ampel Status: {{ validationStatus }}
-      <UForm class="space-y-4" :state="{}" @submit="onSubmit">
-        <FormEngine v-model="formElements" />
-        <UButton type="submit">Submit</UButton>
-      </UForm>
+      <div class="flex flex-col gap-4 sm:gap-6 lg:gap-12 w-full lg:max-w-2xl mx-auto">
+        <UPageCard title="Ampelstatus" variant="naked" orientation="horizontal" class="mb-4">
+          {{ ampelStatusEmoji }}
+        </UPageCard>
+
+        <UPageCard variant="subtle">
+          <UForm class="space-y-4" :state="{}" @submit="onSubmit">
+            <FormEngine v-model="formElements" />
+            <UButton type="submit">Submit</UButton>
+          </UForm>
+        </UPageCard>
+      </div>
     </template>
   </UDashboardPanel>
 </template>
@@ -37,11 +36,11 @@ import { ComplianceStatus, type PagedApplicationFormDto } from '~/.api-client'
 import { useApplicationFormValidator } from '~/composables/useApplicationFormValidator'
 import type { FormElementId } from '~/types/FormElement'
 
-const { getAllApplicationForms, updateApplicationForm } = useApplicationForm()
+const { getAllApplicationFormTemplates, updateApplicationFormTemplate } = useApplicationFormTemplate()
 const { validateFormElements, getHighestComplianceStatus } = useApplicationFormValidator()
 
 const { data } = await useAsyncData<PagedApplicationFormDto>(async () => {
-  return await getAllApplicationForms()
+  return await getAllApplicationFormTemplates()
 })
 
 const formElements = computed({
@@ -64,7 +63,20 @@ watch(
   { deep: true }
 )
 
+const ampelStatusEmoji = computed(() => {
+  switch (validationStatus.value) {
+    case ComplianceStatus.Critical:
+      return '🔴'
+    case ComplianceStatus.Warning:
+      return '🟡'
+    case ComplianceStatus.NonCritical:
+      return '🟢'
+    default:
+      return '🟢'
+  }
+})
+
 async function onSubmit() {
-  await updateApplicationForm(data?.value?.content[0].id, data?.value?.content[0])
+  await updateApplicationFormTemplate(data?.value?.content[0].id, data?.value?.content[0])
 }
 </script>
diff --git a/legalconsenthub/pages/index.vue b/legalconsenthub/pages/index.vue
index 3bad756..c414e85 100644
--- a/legalconsenthub/pages/index.vue
+++ b/legalconsenthub/pages/index.vue
@@ -7,15 +7,9 @@
         </template>
 
         <template #right>
-          <UTooltip text="Notifications" :shortcuts="['N']">
-            <UButton color="neutral" variant="ghost" square>
-              <UChip color="error" inset>
-                <UIcon name="i-lucide-bell" class="size-5 shrink-0" />
-              </UChip>
-            </UButton>
-          </UTooltip>
-
-          <UButton icon="i-lucide-plus" size="md" class="rounded-full" @click="navigateTo('/create')" />
+          <UDropdownMenu :items="items">
+            <UButton icon="i-lucide-plus" size="md" class="rounded-full" />
+          </UDropdownMenu>
         </template>
       </UDashboardNavbar>
 
@@ -25,17 +19,47 @@
     </template>
 
     <template #body>
-      <div>
-        <pre>{{ session }}</pre>
-        <h1>{{ session.data ? 'Du bist eingeloggt' : 'Nicht eingeloggt' }}</h1>
-        <button v-if="session?.data" @click="authClient.signOut()">Sign out</button>
-      </div>
-      <Register />
-      <Login />
+      <UPageList>
+        <UPageCard
+          v-for="(applicationFormElem, index) in applicationForm"
+          :key="index"
+          variant="ghost"
+          :to="`application-forms/${applicationFormElem.id}`"
+        >
+          <template #body>
+            #{{ index }} {{ applicationFormElem.id }} {{ applicationFormElem.createdAt }}
+            {{ applicationFormElem.isTemplate }}
+          </template>
+        </UPageCard>
+      </UPageList>
     </template>
   </UDashboardPanel>
 </template>
 
 <script setup lang="ts">
-const session = authClient.useSession()
+import type { PagedApplicationFormDto } from '~/.api-client'
+const { getAllApplicationForms } = useApplicationForm()
+
+const items = [
+  [
+    {
+      label: 'Neuer Mitbestimmungsantrag',
+      icon: 'i-lucide-send',
+      to: '/create'
+    }
+  ]
+]
+
+const { data } = await useAsyncData<PagedApplicationFormDto>(async () => {
+  return await getAllApplicationForms()
+})
+
+const applicationForm = computed({
+  get: () => data?.value?.content ?? [],
+  set: (val) => {
+    if (val && data.value) {
+      data.value.content = val
+    }
+  }
+})
 </script>
diff --git a/legalconsenthub/pages/login.vue b/legalconsenthub/pages/login.vue
new file mode 100644
index 0000000..156844e
--- /dev/null
+++ b/legalconsenthub/pages/login.vue
@@ -0,0 +1,45 @@
+<template>
+  <UDashboardPanel id="home">
+    <template #header>
+      <UDashboardNavbar title="Home" :ui="{ right: 'gap-3' }">
+        <template #leading>
+          <UDashboardSidebarCollapse />
+        </template>
+
+        <template #right>
+          <UDropdownMenu :items="items">
+            <UButton icon="i-lucide-plus" size="md" class="rounded-full" />
+          </UDropdownMenu>
+        </template>
+      </UDashboardNavbar>
+
+      <UDashboardToolbar>
+        <template #left> toolbar left </template>
+      </UDashboardToolbar>
+    </template>
+
+    <template #body>
+      <div>
+        <pre>{{ session }}</pre>
+        <h1>{{ session.data ? 'Du bist eingeloggt' : 'Nicht eingeloggt' }}</h1>
+        <button v-if="session?.data" @click="authClient.signOut()">Sign out</button>
+      </div>
+      <Register />
+      <Login />
+    </template>
+  </UDashboardPanel>
+</template>
+
+<script setup lang="ts">
+const session = authClient.useSession()
+
+const items = [
+  [
+    {
+      label: 'Neuer Mitbestimmungsantrag',
+      icon: 'i-lucide-send',
+      to: '/create'
+    }
+  ]
+]
+</script>
diff --git a/legalconsenthub/public/favicon.ico b/legalconsenthub/public/favicon.ico
index 18993ad..14a13c9 100644
Binary files a/legalconsenthub/public/favicon.ico and b/legalconsenthub/public/favicon.ico differ