diff --git a/app/location/[id]/add/LocationAddPage.tsx b/app/location/[id]/add/LocationAddPage.tsx
new file mode 100644
index 0000000..ebef49f
--- /dev/null
+++ b/app/location/[id]/add/LocationAddPage.tsx
@@ -0,0 +1,9 @@
+import { notFound } from 'next/navigation';
+import { LocationEditForm } from '@/app/ui/LocationEditForm';
+import { fetchLocationById } from '@/app/lib/actions/locationActions';
+import { YearMonth } from '@/app/lib/db-types';
+import { Main } from '@/app/ui/Main';
+
+export default async function LocationAddPage({ yearMonth }: { yearMonth:YearMonth }) {
+    return (<LocationEditForm yearMonth={yearMonth} />);
+}
\ No newline at end of file
diff --git a/app/location/[id]/add/page.tsx b/app/location/[id]/add/page.tsx
index 24abc7a..fed90e0 100644
--- a/app/location/[id]/add/page.tsx
+++ b/app/location/[id]/add/page.tsx
@@ -1,6 +1,15 @@
 import { parseYearMonth } from '@/app/lib/format';
-import { LocationEditForm } from '@/app/ui/LocationEditForm';
+import { LocationEditFormSkeleton } from '@/app/ui/LocationEditForm';
+import LocationAddPage from './LocationAddPage';
+import { Main } from '@/app/ui/Main';
+import { Suspense } from 'react';
 
 export default async function Page({ params:{ id } }: { params: { id:string } }) {
-    return (<LocationEditForm yearMonth={ parseYearMonth(id) } />);
+    return (
+        <Main>
+            <Suspense fallback={<LocationEditFormSkeleton />}>
+                <LocationAddPage yearMonth={ parseYearMonth(id) } />
+            </Suspense>
+        </Main>
+    );
 }
\ No newline at end of file
diff --git a/app/location/[id]/delete/LocationDeletePage.tsx b/app/location/[id]/delete/LocationDeletePage.tsx
new file mode 100644
index 0000000..7377733
--- /dev/null
+++ b/app/location/[id]/delete/LocationDeletePage.tsx
@@ -0,0 +1,14 @@
+import { notFound } from 'next/navigation';
+import { fetchLocationById } from '@/app/lib/actions/locationActions';
+import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
+
+export const LocationDeletePage = async ({ locationId }: { locationId:string }) => {
+
+    const location = await fetchLocationById(locationId);
+
+    if (!location) {
+        return(notFound());
+    }
+
+    return (<LocationDeleteForm location={location} />);
+}
\ No newline at end of file
diff --git a/app/location/[id]/delete/page.tsx b/app/location/[id]/delete/page.tsx
index f4d8d44..6ae17d5 100644
--- a/app/location/[id]/delete/page.tsx
+++ b/app/location/[id]/delete/page.tsx
@@ -1,14 +1,17 @@
 import { notFound } from 'next/navigation';
 import { fetchLocationById } from '@/app/lib/actions/locationActions';
 import { LocationDeleteForm } from '@/app/ui/LocationDeleteForm';
+import { Main } from '@/app/ui/Main';
+import { Suspense } from 'react';
+import { LocationDeletePage } from './LocationDeletePage';
 
 export default async function Page({ params:{ id } }: { params: { id:string } }) {
 
-    const location = await fetchLocationById(id);
-
-    if (!location) {
-        return(notFound());
-    }
-
-    return (<LocationDeleteForm location={location} />);
+    return (
+        <Main>
+            <Suspense fallback={<div>Loading...</div>}>
+                <LocationDeletePage locationId={id} />
+            </Suspense>
+        </Main>
+    );
 }
\ No newline at end of file
diff --git a/app/location/[id]/edit/LocationEditPage.tsx b/app/location/[id]/edit/LocationEditPage.tsx
index 50d0b31..505f634 100644
--- a/app/location/[id]/edit/LocationEditPage.tsx
+++ b/app/location/[id]/edit/LocationEditPage.tsx
@@ -10,7 +10,7 @@ export default async function LocationEditPage({ locationId }: { locationId:stri
         return(notFound());
     }
 
-    const result = <LocationEditForm location={location} yearMonth={location.yearMonth} />;
+    const result = <LocationEditForm location={location} />;
     
     return (result);
 }
\ No newline at end of file
diff --git a/app/ui/LocationDeleteForm.tsx b/app/ui/LocationDeleteForm.tsx
index ad2f3c8..35eb104 100644
--- a/app/ui/LocationDeleteForm.tsx
+++ b/app/ui/LocationDeleteForm.tsx
@@ -4,7 +4,6 @@ import { FC } from "react";
 import { BillingLocation } from "../lib/db-types";
 import { deleteLocationById } from "../lib/actions/locationActions";
 import { useFormState } from "react-dom";
-import { Main } from "./Main";
 import { gotoUrl } from "../lib/actions/navigationActions";
 import Link from "next/link";
 
@@ -23,20 +22,18 @@ export const LocationDeleteForm:FC<LocationDeleteFormProps> = ({ location }) =>
     };
 
     return(
-        <Main>
-            <div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
-                <div className="card-body">
-                    <form action={dispatch}>
-                        <p className="py-6 px-6">
-                            Please confirm deletion of location “<strong>{location.name}</strong>”.
-                        </p>
-                        <div className="pt-4 text-center">
-                          <button className="btn btn-primary">Confim</button>
-                          <Link className="btn btn-neutral ml-3" href={`/location/${location._id}/edit/`}>Cancel</Link>
-                        </div>
-                    </form>
-                </div>
+        <div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
+            <div className="card-body">
+                <form action={dispatch}>
+                    <p className="py-6 px-6">
+                        Please confirm deletion of location “<strong>{location.name}</strong>”.
+                    </p>
+                    <div className="pt-4 text-center">
+                        <button className="btn btn-primary">Confim</button>
+                        <Link className="btn btn-neutral ml-3" href={`/location/${location._id}/edit/`}>Cancel</Link>
+                    </div>
+                </form>
             </div>
-        </Main>
-    )
+        </div>
+    );
 }
diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx
index 31568d8..9b4aa27 100644
--- a/app/ui/LocationEditForm.tsx
+++ b/app/ui/LocationEditForm.tsx
@@ -12,10 +12,10 @@ export type LocationEditFormProps = {
     /** location which should be edited */
     location: BillingLocation,
     /** year adn month at a new billing location should be assigned */
-    yearMonth: undefined
+    yearMonth?: undefined
 } | {
     /** location which should be edited */
-    location: undefined,
+    location?: undefined,
     /** year adn month at a new billing location should be assigned */
     yearMonth: YearMonth
 }
@@ -23,7 +23,7 @@ export type LocationEditFormProps = {
 export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth }) =>
 {
     const initialState = { message: null, errors: {} };
-    const handleAction = updateOrAddLocation.bind(null, location?._id, yearMonth);
+    const handleAction = updateOrAddLocation.bind(null, location?._id, location?.yearMonth ?? yearMonth);
     const [ state, dispatch ] = useFormState(handleAction, initialState);
 
     let { year, month } = location ? location.yearMonth : yearMonth;
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
index d5b5838..a39518f 100644
--- a/docker-compose-deploy.yml
+++ b/docker-compose-deploy.yml
@@ -9,7 +9,7 @@ networks:
 
 services:
   web-app:
-    image: utility-bills-tracker:1.7.0
+    image: utility-bills-tracker:1.8.0
     networks:
       - traefik-network
       - mongo-network