diff --git a/api_query/src/building.ts b/api_query/src/building.ts
index d2819d39..bd5ec1b2 100644
--- a/api_query/src/building.ts
+++ b/api_query/src/building.ts
@@ -27,7 +27,9 @@ type Element = Prisma.BuildingGetPayload<{
         expected_time: true;
         deleted: true;
         hash: boolean;
-        address: true;
+        address_id: true;
+        syndicus_id: true;
+        manual_id: true;
     };
 }>;
 
diff --git a/web/src/components/images/AddImage.vue b/web/src/components/images/AddImage.vue
deleted file mode 100644
index a1990418..00000000
--- a/web/src/components/images/AddImage.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <v-card class="ma-1">
-    <!-- preview image -->
-    <v-img
-      cover
-      :src="preview"
-      lazySrc="@/assets/images/defaultImage.png"
-      v-model="preview"
-      max-height="300px"
-    >
-      <v-toolbar color="rgba(0, 0, 0, 0)" class="mt-2 pt-2">
-        <template v-slot:append>
-          <v-file-input
-            single
-            v-model="image"
-            accept="image/*"
-            prepend-icon=""
-            prepend-inner-icon="mdi-image"
-            append-inner-icon="mdi-upload"
-            @change="previewImage"
-            variant="solo"
-          />
-        </template>
-      </v-toolbar>
-    </v-img>
-    <v-textarea
-      label="Commentaar"
-      rows="3"
-      v-model="comments"
-      class="mx-4 mt-3"
-    />
-
-    <v-card-actions>
-      <v-btn
-        @click="$emit('delete', id)"
-        v-show="id != 0"
-        color="error"
-        prepend-icon="mdi-delete"
-      >
-        Verwijder afbeelding
-      </v-btn>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts" setup>
-// export default {
-//   name: "HelpView",
-// };
-import { ref } from "vue";
-const preview = ref("");
-const image = ref([]);
-const comments = ref("");
-defineProps({ id: { type: Number, require: true } });
-// function to preview image
-//TODO: type warning
-const previewImage = () => {
-  const reader = new FileReader();
-  reader.onload = () => {
-    preview.value = String(reader.result);
-  };
-  reader.readAsDataURL(image.value[0]);
-};
-// code voor later
-// const submit = () => {
-//   tryOrAlert(() => {
-//     const formData = new FormData();
-//     formData.append("image", image.value);
-//     formData.append("label", label.value);
-//     formData.append("comment", comments.value);
-//     //const response = await axios.post("/images", formData);
-//     // reset form after submit
-//     //file.value = null;
-//     preview.value = ref(null);
-//     label.value = "";
-//     comments.value = "";
-//     image.value = null;
-//     //emit("form-submitted", formData);
-//   });
-// };
-</script>
-
-<style scoped>
-.d-flex {
-  display: flex;
-}
-.justify-center {
-  justify-content: center;
-}
-.align-center {
-  align-items: center;
-}
-</style>
diff --git a/web/src/components/images/MultiAddImage.vue b/web/src/components/images/MultiAddImage.vue
deleted file mode 100644
index 53374311..00000000
--- a/web/src/components/images/MultiAddImage.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <v-card>
-    <!-- list to show all images -->
-    <AddImage
-      v-for="id in images"
-      :key="id"
-      :id="id"
-      @delete="
-        (id) => {
-          remove(id);
-        }
-      "
-      class="mb-4"
-    />
-    <v-card-actions>
-      <v-btn
-        block
-        @click="addMore"
-        prepend-icon="mdi-plus"
-        color="primary"
-        variant="elevated"
-      >
-        afbeelding toevoegen
-      </v-btn>
-    </v-card-actions>
-  </v-card>
-</template>
-
-<script lang="ts" setup>
-import { reactive } from "vue";
-import AddImage from "./AddImage.vue";
-const images = reactive([1]);
-//add image
-const addMore = () => {
-  images.push(1);
-};
-//remove image
-const remove = (index: number) => {
-  images.splice(index, 1);
-};
-</script>
diff --git a/web/src/router/index.ts b/web/src/router/index.ts
index 04b54611..23bc19a4 100644
--- a/web/src/router/index.ts
+++ b/web/src/router/index.ts
@@ -159,9 +159,10 @@ const routes: any[] = [
         },
       },
       {
-        path: "/gebouw/nieuw",
+        path: "/gebouw/nieuw/:id?",
         name: "building_new",
         component: BuildingMaker,
+        props: true,
         meta: {
           title: "Nieuw gebouw",
           auth: (
diff --git a/web/src/views/building/BuildingMaker.vue b/web/src/views/building/BuildingMaker.vue
index 5bb325cd..1c8fa662 100644
--- a/web/src/views/building/BuildingMaker.vue
+++ b/web/src/views/building/BuildingMaker.vue
@@ -14,37 +14,74 @@
         v-model="building.ivago_id"
         label="Ivago ID"
       ></v-text-field>
+
       <v-select
         label="Syndicus"
-        :items="syndici.map((e) => e.id)"
-        v-model="building.syndicus_id"
-      ></v-select>
+        :items="possibleUsers"
+        v-model="building.syndicus"
+        prepend-inner-icon="mdi-account"
+      >
+        <template v-slot:item="{ props, item }">
+          <v-list-item v-bind="props" :title="item.name" :subtitle="item.name">
+            <p>{{ getFullStudentName(item.value) }}</p>
+          </v-list-item>
+        </template>
+
+        <template v-slot:selection="{ item }">
+          <p>{{ getFullStudentName(item.value) }}</p>
+        </template>
+      </v-select>
+
+      <v-text-field
+        required
+        type="number"
+        prepend-inner-icon="mdi-clock"
+        v-model="building.expectedTimeInHours"
+        label="Verwachte werktijd in uur"
+      ></v-text-field>
 
       <v-file-input
         id="manual-id"
+        v-model="uploadedManual"
         prepend-icon=""
         prepend-inner-icon="mdi-file"
-        label="Handleiding"
+        :label="edit ? `${manualName}` : 'Handleiding'"
       ></v-file-input>
     </BorderCard>
 
+    <BorderCard prepend-icon="mdi-text" class="mb-3 px-4" title="Beschrijving">
+      <v-textarea
+        rows="4"
+        label="Beschrijving van het gebouw"
+        prepend-inner-icon="mdi-text"
+        v-model="building.description"
+      ></v-textarea>
+    </BorderCard>
+
     <!-- card met alle info over de locatie -->
-    <BorderCard class="mb-3">
-      <v-img
-        src="@/assets/images/dummyMap.png"
-        v-model="dummyMap"
-        max-height="300px"
-        cover
-      >
-        <v-toolbar color="rgb(250, 250, 250, 0)" class="pl-4">
-          <template v-slot:title>
-            <v-card-title> Locatie info </v-card-title>
-          </template>
-          <template v-slot:prepend>
-            <v-icon icon="mdi-access-point" size="large"></v-icon>
-          </template>
-        </v-toolbar>
-      </v-img>
+    <BorderCard
+      prepend-icon="mdi-map-marker"
+      class="mb-3 px-4"
+      title="Locatie info"
+    >
+      <BorderCard style="height: 400px" class="mx-4">
+        <l-map ref="map" v-model:zoom="zoom" :center="[51, 4.4699]">
+          <l-tile-layer
+            url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+            layer-type="base"
+            name="OpenStreetMap"
+          />
+          <l-marker
+            :key="building.ivago_id"
+            :lat-lng="[latitude, longitude]"
+            name="building"
+          >
+            <l-tooltip :options="{ permanent: true }">
+              {{ building.name }}
+            </l-tooltip>
+          </l-marker>
+        </l-map>
+      </BorderCard>
 
       <div class="mx-4 mt-3">
         <v-row>
@@ -52,89 +89,406 @@
             <v-text-field
               required
               type="number"
-              v-model="address.longitude"
-              label="Longitude"
+              v-model="latitude"
+              label="Latitude"
             ></v-text-field>
           </v-col>
           <v-col>
             <v-text-field
               required
               type="number"
-              v-model="address.latitude"
-              label="Latitude"
+              v-model="longitude"
+              label="Longitude"
             ></v-text-field>
           </v-col>
         </v-row>
         <!-- addres forum gebruiken -->
-        <AddressForm
-          @onUpdate="(newAddress) => (address = newAddress)"
-        ></AddressForm>
+        <v-row class="py-0 my-0 mt-2">
+          <v-col
+            cols="1"
+            style="min-width: 100px; max-width: 100%"
+            class="flex-grow-1 flex-shrink-0 py-0 my-0"
+          >
+            <!-- Text input field for the street name -->
+            <v-text-field
+              v-model="address.street"
+              label="Straat"
+              type="text"
+              required
+              variant="outlined"
+              :rules="streetRules"
+            >
+              <template v-slot:prepend-inner>
+                <v-icon icon="mdi-road-variant" />
+              </template>
+            </v-text-field>
+          </v-col>
+          <v-col cols="3" class="flex-grow-0 flex-shrink-0 py-0 my-0">
+            <!-- Text input field for the house number -->
+            <HomeNumberInputField :readonly="false" v-model="address.number" />
+          </v-col>
+        </v-row>
+
+        <v-row class="py-0 my-0 mt-2 mb-1">
+          <v-col
+            cols="1"
+            style="min-width: 100px; max-width: 100%"
+            class="flex-grow-1 flex-shrink-0 py-0 my-0"
+          >
+            <!-- Text input field for the city name -->
+            <v-text-field
+              v-model="address.city"
+              label="Stad"
+              type="text"
+              required
+              variant="outlined"
+              :rules="cityRules"
+            >
+              <template v-slot:prepend-inner>
+                <v-icon icon="mdi-city-variant" />
+              </template>
+            </v-text-field>
+          </v-col>
+          <v-col cols="3" class="flex-grow-0 flex-shrink-0 py-0 my-0">
+            <!-- Text input field for the zip code -->
+            <ZipCodeInputField :readonly="false" v-model="address.zip_code" />
+          </v-col>
+        </v-row>
       </div>
     </BorderCard>
 
+    <BorderCard v-if="!edit" class="mb-3 px-4">
+      <template v-slot:prepend><v-icon icon="mdi-image" /></template>
+      <template v-slot:title>Foto's</template>
+      <template v-slot:append
+        ><v-icon class="mr-2" icon="mdi-plus" @click="addFileId()"></v-icon
+        ><v-icon class="ml-2" icon="mdi-delete" @click="removeFileId()"></v-icon
+      ></template>
+      <v-list>
+        <v-list-item v-for="fileId of fileIds" :key="fileId">
+          <v-file-input
+            class="mt-1"
+            :multiple="false"
+            :id="fileId"
+            accept="image/jpeg"
+            prepend-icon=""
+            prepend-inner-icon="mdi-file"
+            :label="fileId"
+          ></v-file-input>
+        </v-list-item> </v-list
+    ></BorderCard>
+
+    <BorderCard v-else class="mb-3 px-4">
+      <template v-slot:prepend><v-icon icon="mdi-image" /></template>
+      <template v-slot:title>Foto's</template>
+      <v-file-input
+        id="soloImage"
+        class="mt-1 mx-5"
+        :multiple="false"
+        accept="image/jpeg"
+        prepend-icon=""
+        prepend-inner-icon="mdi-file"
+        label="Nieuwe afbeelding"
+      ></v-file-input
+      ><v-btn type="submit" color="success" class="ml-5" @click="addSoloImage()"
+        >Voeg afbeelding toe</v-btn
+      >
+      <v-list>
+        <v-list-item v-for="entry in images" :key="entry.id"
+          ><BorderCard class="mb-3 px-4">
+            <template v-slot:prepend
+              ><v-img
+                :src="ImgProxy.env.url(entry.image)"
+                style="width: 75px; height: 75px; object-fit: cover"
+            /></template>
+            <template v-slot:append
+              ><v-icon
+                class="ml-2"
+                icon="mdi-delete"
+                @click="removeSoloImage(entry.image_id)"
+              ></v-icon
+            ></template> </BorderCard
+        ></v-list-item>
+      </v-list>
+    </BorderCard>
+
     <v-btn
       @click="submit"
       type="submit"
       color="success"
       prepend-icon="mdi-check"
       class="mb-12"
-      >Maak gebouw</v-btn
+      >{{ edit ? "Pas wijzigingen toe" : "Maak gebouw" }}</v-btn
     >
   </HFillWrapper>
 </template>
 
 <script lang="ts" setup>
 import { ref } from "vue";
-import AddressForm from "../../components/forms/AddressForm.vue";
 import HFillWrapper from "@/layouts/HFillWrapper.vue";
 import BorderCard from "@/layouts/CardLayout.vue";
 import { tryOrAlertAsync } from "@/try";
 import {
+  Result,
   AddressQuery,
   BuildingQuery,
-  FileQuery,
+  UserQuery,
   SyndicusQuery,
+  FileQuery,
 } from "@selab-2/groep-1-query";
+import { File, BuildingImages } from "@selab-2/groep-1-orm";
 import router from "@/router";
+import "leaflet/dist/leaflet.css";
+import "leaflet/dist/leaflet.js";
+import { LMap, LTileLayer, LMarker, LTooltip } from "@vue-leaflet/vue-leaflet";
+import { ImgProxy } from "@/imgproxy";
+import HomeNumberInputField from "@/components/inputfields/HomeNumberInputField.vue";
+import ZipCodeInputField from "@/components/inputfields/ZipCodeInputField.vue";
 
-const dummyMap = ref(null);
+const possibleUsers = await new UserQuery().getAll({
+  admin: false,
+  student: false,
+  super_student: false,
+});
 
 const syndici = await new SyndicusQuery().getAll();
 
 const address = ref({
   street: "",
-  number: 0,
+  number: "0",
   city: "",
-  zip_code: 0,
-  latitude: 0,
-  longitude: 0,
+  zip_code: "0",
 });
+const latitude = ref(0);
+const longitude = ref(0);
+
+const address_id = ref<number>(0);
 
 const building = ref({
   name: "",
   ivago_id: "",
-  syndicus_id: 0,
+  description: "",
+  syndicus: {
+    id: 0,
+    first_name: "",
+    last_name: "",
+  },
   address_id: 0,
-  manual_id: 0,
+  manual_id: 1,
+  expectedTimeInHours: 0,
+});
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: "",
+  },
 });
 
+const images = ref<
+  (BuildingImages & {
+    image: File;
+  })[]
+>();
+
+const fileIds = ref<string[]>(["Hoofdafbeelding"]);
+
+const uploadedManual = ref();
+const manualName = ref<string>();
+
+function addFileId() {
+  fileIds.value.push("Afbeelding " + fileIds.value.length);
+}
+
+function removeFileId() {
+  if (fileIds.value.length > 1) {
+    fileIds.value.pop();
+  }
+}
+
+const fullBuilding = ref<Result<BuildingQuery>>();
+
+const buildingId = ref<number>(Number(props.id));
+const edit: boolean = props.id !== "";
+
+if (edit) {
+  const requestedBuilding: Result<BuildingQuery> =
+    await new BuildingQuery().getOne(buildingId.value);
+  setFields(requestedBuilding);
+}
+
+async function setFields(requestedBuilding: Result<BuildingQuery>) {
+  tryOrAlertAsync(async () => {
+    const thisSyndicus = requestedBuilding.syndicus;
+    const thisAddress = requestedBuilding.address;
+
+    fullBuilding.value = requestedBuilding;
+    building.value.name = requestedBuilding.name;
+    building.value.ivago_id = requestedBuilding.ivago_id;
+    building.value.syndicus = {
+      id: thisSyndicus.id,
+      first_name: thisSyndicus.user.first_name,
+      last_name: thisSyndicus.user.last_name,
+    };
+    building.value.description = requestedBuilding.description
+      ? requestedBuilding.description
+      : "";
+    building.value.manual_id = requestedBuilding.manual?.id ?? 1;
+
+    address_id.value = thisAddress.id;
+    building.value.expectedTimeInHours = requestedBuilding.expected_time
+      ? Math.floor(requestedBuilding.expected_time / 60)
+      : 0;
+
+    address.value = {
+      street: thisAddress.street,
+      number: thisAddress.number.toString(),
+      city: thisAddress.city,
+      zip_code: thisAddress.zip_code.toString(),
+    };
+    latitude.value = requestedBuilding.address.latitude;
+    longitude.value = requestedBuilding.address.longitude;
+    images.value = requestedBuilding.images;
+    manualName.value = requestedBuilding.manual?.original_name;
+  });
+}
+
+async function addSoloImage() {
+  if (fullBuilding.value) {
+    const newBuilding: Result<BuildingQuery> =
+      await new BuildingQuery().createImage(fullBuilding.value, "soloImage");
+    setFields(newBuilding);
+  }
+}
+
+async function removeSoloImage(id: number) {
+  const removeBuilding = await new BuildingQuery().deleteImage(
+    buildingId.value,
+    { id: id },
+    true,
+  );
+
+  setFields(removeBuilding);
+}
+
 const submit = () => {
   tryOrAlertAsync(async () => {
-    // Create address
-    const { id } = await new AddressQuery().createOne(address.value);
-    building.value.address_id = id;
+    const buildingUnwrapped = building.value;
+
+    const formattedAddress = {
+      ...{
+        street: address.value.street,
+        number: Number(address.value.number),
+        city: address.value.city,
+        zip_code: Number(address.value.zip_code),
+      },
+      ...{ latitude: latitude.value, longitude: longitude.value },
+    };
+
+    if (!edit) {
+      const isNewSyndicus: boolean = syndici.some(
+        (s: Result<SyndicusQuery>) => {
+          return s.user_id === buildingUnwrapped.syndicus.id;
+        },
+      );
+
+      // Create address
+      const newAddress = await new AddressQuery().createOne(formattedAddress);
+
+      if (isNewSyndicus) {
+        let { id: syndicusId } = await new SyndicusQuery().createOne({
+          user_id: buildingUnwrapped.syndicus.id,
+        });
+        buildingUnwrapped.syndicus.id = syndicusId;
+      }
+
+      const file = await new FileQuery().createOne("manual-id");
+
+      const newBuilding = await new BuildingQuery().createOne({
+        name: buildingUnwrapped.name,
+        address_id: newAddress.id,
+        description: buildingUnwrapped.description,
+        ivago_id: buildingUnwrapped.ivago_id,
+        expected_time: buildingUnwrapped.expectedTimeInHours * 60,
+        syndicus_id: buildingUnwrapped.syndicus.id,
+        manual_id: file.id,
+      });
+
+      for (const fileId of fileIds.value) {
+        const element: any = document.getElementById(fileId);
+        if (element.files.length > 0) {
+          await new BuildingQuery().createImage(newBuilding, fileId);
+        }
+      }
+      await router.push(`/gebouw/${newBuilding.id}`);
+    } else {
+      if (uploadedManual.value) {
+        const file = await new FileQuery().createOne("manual-id");
+        building.value.manual_id = file.id;
+      }
 
-    // Upload file
-    const file = await new FileQuery().createOne("manual-id");
-    building.value.manual_id = file.id;
+      // Create address
+      const newAddress = await new AddressQuery().updateOne({
+        ...{ id: address_id.value },
+        ...formattedAddress,
+      });
 
-    // Create building
-    const { id: buildingId } = await new BuildingQuery().createOne(
-      building.value,
-    );
+      let syndicus = (
+        await new SyndicusQuery().getAll({
+          user: buildingUnwrapped.syndicus.id,
+        })
+      ).pop();
 
-    // Redirect
-    await router.push(`/gebouw/${buildingId}`);
+      if (!syndicus) {
+        syndicus = await new SyndicusQuery().createOne({
+          user_id: buildingUnwrapped.syndicus.id,
+        });
+      }
+
+      const newBuilding = await new BuildingQuery().updateOne({
+        id: buildingId.value,
+        name: buildingUnwrapped.name,
+        address_id: newAddress.id,
+        description: buildingUnwrapped.description,
+        ivago_id: buildingUnwrapped.ivago_id,
+        expected_time: buildingUnwrapped.expectedTimeInHours * 60,
+        manual_id: building.value.manual_id,
+        syndicus_id: syndicus.id,
+      });
+
+      await router.push(`/gebouw/${newBuilding.id}`);
+    }
   });
 };
+
+function getFullStudentName(s: Result<UserQuery> | undefined): string {
+  if (s) {
+    return s.first_name + " " + s.last_name;
+  } else {
+    return " ";
+  }
+}
+
+/* below are the rule checks*/
+
+const streetRules = [
+  // check if street is present
+  (street: string) => {
+    return street ? true : "Geef een straat op.";
+  },
+];
+
+const cityRules = [
+  // check if city is present
+  (city: string) => {
+    return city ? true : "Geef een stad op.";
+  },
+
+  // check if city only contains chars
+  (city: string) => {
+    return /^[a-zA-Z]+$/.test(city) ? true : "Stad kan geen nummers bevatten.";
+  },
+];
+
+const zoom = ref(8);
 </script>
diff --git a/web/src/views/building/BuildingScreen.vue b/web/src/views/building/BuildingScreen.vue
index 1e6edd03..fbb89b78 100644
--- a/web/src/views/building/BuildingScreen.vue
+++ b/web/src/views/building/BuildingScreen.vue
@@ -69,6 +69,15 @@
               Handleiding
             </SimpleButton>
           </div>
+          <SimpleButton
+            v-show="useAuthStore().auth?.admin && !building.deleted"
+            class="text-none"
+            prepend-icon="mdi-pencil"
+            @click="routeToChange()"
+            color="primary"
+          >
+            Pas aan
+          </SimpleButton>
 
           <SimpleButton
             v-show="useAuthStore().auth?.admin && !building.deleted"
@@ -416,6 +425,10 @@ async function restoreBuilding() {
   });
   router.go(0);
 }
+
+function routeToChange() {
+  router.push({ name: "building_new", params: { id: building.value?.id } });
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/views/student/SchedulingScreenStudents.vue b/web/src/views/student/SchedulingScreenStudents.vue
index 733f7fa0..618dd645 100644
--- a/web/src/views/student/SchedulingScreenStudents.vue
+++ b/web/src/views/student/SchedulingScreenStudents.vue
@@ -60,7 +60,9 @@
                 variant="text"
                 size="compact"
               >
-                {{ new Date(item.schedule.day).toLocaleTimeString().slice(0,5) }}
+                {{
+                  new Date(item.schedule.day).toLocaleTimeString().slice(0, 5)
+                }}
               </v-chip>
               <v-chip label color="primary" class="mr-2">
                 <v-icon