diff --git a/src/plugins/schedule/components/management/EventTypes.vue b/src/plugins/schedule/components/management/EventTypes.vue
index d258ff1..a9dbf80 100644
--- a/src/plugins/schedule/components/management/EventTypes.vue
+++ b/src/plugins/schedule/components/management/EventTypes.vue
@@ -15,32 +15,30 @@
       </q-card>
     </q-dialog>
 
-    <q-page padding>
-      <q-card>
-        <q-card-section>
-          <q-table title="Veranstaltungstypen" :data="rows" row-key="jobid" :columns="columns">
-            <template #top-right>
-              <q-input v-model="newEventType" dense placeholder="Neuer Typ" />
+    <q-card>
+      <q-card-section>
+        <q-table title="Veranstaltungstypen" :rows="rows" row-key="jobid" :columns="columns">
+          <template #top-right>
+            <q-input v-model="newEventType" dense placeholder="Neuer Typ" />
 
-              <div></div>
-              <q-btn color="primary" icon="mdi-plus" label="Hinzufügen" @click="addType" />
-            </template>
-            <template #body-cell-actions="props">
-              <!-- <q-btn :label="item"> -->
-              <!-- {{ item.row.name }} -->
-              <q-td :props="props" align="right" :auto-width="true">
-                <q-btn
-                  round
-                  icon="mdi-pencil"
-                  @click="editType({ id: props.row.id, name: props.row.name })"
-                />
-                <q-btn round icon="mdi-delete" @click="deleteType(props.row.id)" />
-              </q-td>
-            </template>
-          </q-table>
-        </q-card-section>
-      </q-card>
-    </q-page>
+            <div></div>
+            <q-btn color="primary" icon="mdi-plus" label="Hinzufügen" @click="addType" />
+          </template>
+          <template #body-cell-actions="props">
+            <!-- <q-btn :label="item"> -->
+            <!-- {{ item.row.name }} -->
+            <q-td :props="props" align="right" :auto-width="true">
+              <q-btn
+                round
+                icon="mdi-pencil"
+                @click="editType({ id: props.row.id, name: props.row.name })"
+              />
+              <q-btn round icon="mdi-delete" @click="deleteType(props.row.id)" />
+            </q-td>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
   </div>
 </template>
 
@@ -59,7 +57,7 @@ export default defineComponent({
     const actualEvent = ref(emptyEvent);
     const newEventName = ref('');
 
-    onBeforeMount(() => store.getEventTypes());
+    onBeforeMount(async () => await store.getEventTypes());
 
     const rows = computed(() => store.eventTypes);
 
diff --git a/src/plugins/schedule/components/management/JobTypes.vue b/src/plugins/schedule/components/management/JobTypes.vue
index 7273673..c3fc3f8 100644
--- a/src/plugins/schedule/components/management/JobTypes.vue
+++ b/src/plugins/schedule/components/management/JobTypes.vue
@@ -15,32 +15,30 @@
       </q-card>
     </q-dialog>
 
-    <q-page padding>
-      <q-card>
-        <q-card-section>
-          <q-table title="Diensttypen" :data="rows" row-key="jobid" :columns="columns">
-            <template #top-right>
-              <q-input v-model="newJob" dense placeholder="Neuer Typ" />
+    <q-card>
+      <q-card-section>
+        <q-table title="Diensttypen" :rows="rows" row-key="jobid" :columns="columns">
+          <template #top-right>
+            <q-input v-model="newJob" dense placeholder="Neuer Typ" />
 
-              <div></div>
-              <q-btn color="primary" icon="mdi-plus" label="Hinzufügen" @click="addType" />
-            </template>
-            <template #body-cell-actions="props">
-              <!-- <q-btn :label="item"> -->
-              <!-- {{ item.row.name }} -->
-              <q-td :props="props" align="right" :auto-width="true">
-                <q-btn
-                  round
-                  icon="mdi-pencil"
-                  @click="editType({ id: props.row.id, name: props.row.name })"
-                />
-                <q-btn round icon="mdi-delete" @click="deleteType(props.row.id)" />
-              </q-td>
-            </template>
-          </q-table>
-        </q-card-section>
-      </q-card>
-    </q-page>
+            <div></div>
+            <q-btn color="primary" icon="mdi-plus" label="Hinzufügen" @click="addType" />
+          </template>
+          <template #body-cell-actions="props">
+            <!-- <q-btn :label="item"> -->
+            <!-- {{ item.row.name }} -->
+            <q-td :props="props" align="right" :auto-width="true">
+              <q-btn
+                round
+                icon="mdi-pencil"
+                @click="editType({ id: props.row.id, name: props.row.name })"
+              />
+              <q-btn round icon="mdi-delete" @click="deleteType(props.row.id)" />
+            </q-td>
+          </template>
+        </q-table>
+      </q-card-section>
+    </q-card>
   </div>
 </template>