diff --git a/client/.env.production.sample b/client/.env.production.sample
index 659ffaf..e7c8bee 100644
--- a/client/.env.production.sample
+++ b/client/.env.production.sample
@@ -2,4 +2,4 @@
 NEXT_PUBLIC_BASE_URL=https://lanten.site/api
 
 # Server URL
-SERVER_BASE_URL=http://server:5000
\ No newline at end of file
+SERVER_BASE_URL=https://lanten.site/api
\ No newline at end of file
diff --git a/client/src/app/(dashboard)/(both)/home/(leases)/latest-leases-card.tsx b/client/src/app/(dashboard)/(both)/home/(leases)/latest-leases-card.tsx
index 63989b8..90d6ec2 100644
--- a/client/src/app/(dashboard)/(both)/home/(leases)/latest-leases-card.tsx
+++ b/client/src/app/(dashboard)/(both)/home/(leases)/latest-leases-card.tsx
@@ -43,6 +43,7 @@ export async function LatestLeasesCard() {
                                 <Link
                                     key={lease.id}
                                     href={`/leases/${lease.id}`}
+                                    prefetch={false}
                                     passHref
                                 >
                                     <div className="rounded-md border whitespace-nowrap p-3 hover-card">
diff --git a/client/src/app/(dashboard)/(both)/home/(messages)/latest-messages-card.tsx b/client/src/app/(dashboard)/(both)/home/(messages)/latest-messages-card.tsx
index 8f6df5b..2a53448 100644
--- a/client/src/app/(dashboard)/(both)/home/(messages)/latest-messages-card.tsx
+++ b/client/src/app/(dashboard)/(both)/home/(messages)/latest-messages-card.tsx
@@ -35,7 +35,7 @@ export async function LatestMessagesCard() {
                     </p>
                 )}
                 {messageChannels.map((user) => (
-                    <Link key={user.id} href={`/messages/${user.id}`} passHref>
+                    <Link key={user.id} href={`/messages/${user.id}`} prefetch={false} passHref>
                         <div className="flex flex-row gap-2 items-center justify-between border rounded p-3 text-sm hover-card">
                             <div className="flex gap-2 items-center">
                                 <MessageCircle size={16} />
diff --git a/client/src/app/(dashboard)/(both)/home/loading.tsx b/client/src/app/(dashboard)/(both)/home/loading.tsx
new file mode 100644
index 0000000..658d3df
--- /dev/null
+++ b/client/src/app/(dashboard)/(both)/home/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/loading-spinner";
+
+export default function Loading() {
+    return <LoadingSpinner />;
+}
diff --git a/client/src/app/(dashboard)/(both)/leases/[leaseID]/(details)/lease-details-card.tsx b/client/src/app/(dashboard)/(both)/leases/[leaseID]/(details)/lease-details-card.tsx
index 8b77a12..7975979 100644
--- a/client/src/app/(dashboard)/(both)/leases/[leaseID]/(details)/lease-details-card.tsx
+++ b/client/src/app/(dashboard)/(both)/leases/[leaseID]/(details)/lease-details-card.tsx
@@ -44,6 +44,7 @@ export default function LeaseDetailsCard({ lease }: LeaseDetailsCardProps) {
                             <Link
                                 href={`/properties/${lease.propertyId}`}
                                 className="link-primary"
+                                prefetch={false}
                             >
                                 {lease.property?.name}
                             </Link>
diff --git a/client/src/app/(dashboard)/(both)/leases/invite/loading.tsx b/client/src/app/(dashboard)/(both)/leases/invite/loading.tsx
new file mode 100644
index 0000000..658d3df
--- /dev/null
+++ b/client/src/app/(dashboard)/(both)/leases/invite/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/loading-spinner";
+
+export default function Loading() {
+    return <LoadingSpinner />;
+}
diff --git a/client/src/app/(dashboard)/(both)/leases/page.tsx b/client/src/app/(dashboard)/(both)/leases/page.tsx
index bff1b73..7de5016 100644
--- a/client/src/app/(dashboard)/(both)/leases/page.tsx
+++ b/client/src/app/(dashboard)/(both)/leases/page.tsx
@@ -44,8 +44,11 @@ export default async function Page() {
                 </WithAuthorized>
             </div>
             <div className="mt-5 flex flex-col gap-4">
+                {activeLeases.length === 0 && (
+                    <p className="text-gray-500">No active leases found.</p>
+                )}
                 {activeLeases.map((lease) => (
-                    <Link key={lease.id} href={`/leases/${lease.id}`}>
+                    <Link key={lease.id} prefetch={false} href={`/leases/${lease.id}`}>
                         <Card className="hover-card">
                             <CardHeader className="flex flex-row items-center justify-between">
                                 <div className="flex flex-col gap-2">
diff --git a/client/src/app/(dashboard)/(both)/maintenance/loading.tsx b/client/src/app/(dashboard)/(both)/maintenance/loading.tsx
new file mode 100644
index 0000000..658d3df
--- /dev/null
+++ b/client/src/app/(dashboard)/(both)/maintenance/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/loading-spinner";
+
+export default function Loading() {
+    return <LoadingSpinner />;
+}
diff --git a/client/src/app/(dashboard)/(both)/maintenance/requests-table.tsx b/client/src/app/(dashboard)/(both)/maintenance/requests-table.tsx
index 639d99b..a0a2e27 100644
--- a/client/src/app/(dashboard)/(both)/maintenance/requests-table.tsx
+++ b/client/src/app/(dashboard)/(both)/maintenance/requests-table.tsx
@@ -145,7 +145,7 @@ export const columns: ColumnDef<MaintenanceRequest>[] = [
             const lease = row.getValue("lease") as Partial<Lease>;
             return (
                 <Button variant="link" asChild className="p-0">
-                    <Link href={`/leases/${lease?.id}`}>
+                    <Link href={`/leases/${lease?.id}`} prefetch={false}>
                         {lease?.property?.name}
                     </Link>
                 </Button>
diff --git a/client/src/app/(dashboard)/(both)/messages/loading.tsx b/client/src/app/(dashboard)/(both)/messages/loading.tsx
new file mode 100644
index 0000000..658d3df
--- /dev/null
+++ b/client/src/app/(dashboard)/(both)/messages/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/loading-spinner";
+
+export default function Loading() {
+    return <LoadingSpinner />;
+}
diff --git a/client/src/app/(dashboard)/(both)/messages/page.tsx b/client/src/app/(dashboard)/(both)/messages/page.tsx
index 88f7587..8086bca 100644
--- a/client/src/app/(dashboard)/(both)/messages/page.tsx
+++ b/client/src/app/(dashboard)/(both)/messages/page.tsx
@@ -34,7 +34,7 @@ export default async function Page() {
                     </p>
                 )}
                 {messageChannels.map((channel) => (
-                    <Link key={channel.id} href={`/messages/${channel.id}`}>
+                    <Link key={channel.id} href={`/messages/${channel.id}`} prefetch={false}>
                         <Card
                             key={channel.id}
                             className="hover:bg-gray-100 duration-500"
diff --git a/client/src/app/(dashboard)/(both)/settings/loading.tsx b/client/src/app/(dashboard)/(both)/settings/loading.tsx
new file mode 100644
index 0000000..658d3df
--- /dev/null
+++ b/client/src/app/(dashboard)/(both)/settings/loading.tsx
@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/loading-spinner";
+
+export default function Loading() {
+    return <LoadingSpinner />;
+}
diff --git a/client/src/app/(dashboard)/(landlord)/properties/[propertyID]/delete-property-client.tsx b/client/src/app/(dashboard)/(landlord)/properties/[propertyID]/delete-property-client.tsx
index 9431f99..55a6284 100644
--- a/client/src/app/(dashboard)/(landlord)/properties/[propertyID]/delete-property-client.tsx
+++ b/client/src/app/(dashboard)/(landlord)/properties/[propertyID]/delete-property-client.tsx
@@ -53,7 +53,7 @@ export function DeletePropertyClient({
                             <ol className="list-decimal list-inside">
                                 {leases.map((lease) => (
                                     <li key={lease.id}>
-                                        <Link href={`/leases/${lease.id}`}>
+                                        <Link href={`/leases/${lease.id}`} prefetch={false}>
                                             {" "}
                                             {formatTimeToDateString(
                                                 lease.startDate
diff --git a/client/src/app/(dashboard)/(landlord)/properties/page.tsx b/client/src/app/(dashboard)/(landlord)/properties/page.tsx
index 51c2f4a..f1853be 100644
--- a/client/src/app/(dashboard)/(landlord)/properties/page.tsx
+++ b/client/src/app/(dashboard)/(landlord)/properties/page.tsx
@@ -45,6 +45,7 @@ export default async function Page() {
                         <Link
                             href="/properties/create"
                             className="hover:underline hover:text-green-700"
+                            prefetch={false}
                         >
                             Create
                         </Link>{" "}
@@ -57,6 +58,7 @@ export default async function Page() {
                         key={property.id}
                         href={`/properties/${property.id}`}
                         className="flex-grow flex-shrink basis-0 max-w-80"
+                        prefetch={false}
                     >
                         <Card className="hover-card h-full">
                             <div className="relative aspect-video overflow-hidden rounded-t-lg h-[150px] w-full">
diff --git a/client/src/app/(dashboard)/(landlord)/tenants/tenants-table.tsx b/client/src/app/(dashboard)/(landlord)/tenants/tenants-table.tsx
index bc0fa13..97d9873 100644
--- a/client/src/app/(dashboard)/(landlord)/tenants/tenants-table.tsx
+++ b/client/src/app/(dashboard)/(landlord)/tenants/tenants-table.tsx
@@ -138,7 +138,7 @@ export const columns: ColumnDef<LeaseTenant>[] = [
             const lease = row.getValue("lease") as Partial<Lease>;
             return (
                 <Button variant="link" asChild className="p-0">
-                    <Link href={`/leases/${lease?.id}`}>
+                    <Link href={`/leases/${lease?.id}`} prefetch={false}>
                         {lease?.property?.name}
                     </Link>
                 </Button>
diff --git a/client/src/app/documents/[documentID]/page.tsx b/client/src/app/documents/[documentID]/page.tsx
index 44e5833..d75b371 100644
--- a/client/src/app/documents/[documentID]/page.tsx
+++ b/client/src/app/documents/[documentID]/page.tsx
@@ -35,7 +35,7 @@ export default async function Page({ params: { documentID } }: PageProps) {
                     <div className="text-sm text-gray-500">
                         If the document does not open, click{" "}
                         <Button variant="link" className="p-0" asChild>
-                            <Link href={link}>here</Link>
+                            <Link href={link} prefetch={false}>here</Link>
                         </Button>
                         .
                     </div>
@@ -46,7 +46,7 @@ export default async function Page({ params: { documentID } }: PageProps) {
                     <div className="text-sm text-gray-500">
                         Click{" "}
                         <Button variant="link" className="p-0" asChild>
-                            <Link href="/home">here</Link>
+                            <Link href="/home" prefetch={false}>here</Link>
                         </Button>{" "}
                         to go back to the dashboard.
                     </div>
diff --git a/client/src/app/login/page.tsx b/client/src/app/login/page.tsx
index c1dfe60..ecec6f8 100644
--- a/client/src/app/login/page.tsx
+++ b/client/src/app/login/page.tsx
@@ -19,7 +19,7 @@ export default async function Page({ searchParams }: PageProps) {
     return (
         <>
             <div className="flex items-center justify-between w-full px-6 py-4">
-                <Link href="/">
+                <Link href="/" prefetch={false}>
                     <div className="flex items-center space-x-4">
                         <Image
                             alt="Logo"
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 14bb49b..f39714a 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -7,7 +7,7 @@ export default async function Home() {
     return (
         <>
             <div className="flex items-center justify-between w-full px-6 py-4">
-                <Link href="/">
+                <Link href="/" prefetch={false}>
                     <div className="flex items-center space-x-4">
                         <Image
                             alt="Logo"
@@ -22,10 +22,10 @@ export default async function Home() {
                 </Link>
                 <div className="flex items-center gap-2">
                     <Button asChild variant="ghost">
-                        <Link href="/login">Login</Link>
+                        <Link href="/login" prefetch={false}>Login</Link>
                     </Button>
                     <Button asChild>
-                        <Link href="/login?tab=signup">Signup</Link>
+                        <Link href="/login?tab=signup" prefetch={false}>Signup</Link>
                     </Button>
                 </div>
             </div>
@@ -42,7 +42,7 @@ export default async function Home() {
                             </p>
                         </div>
                         <Button asChild>
-                            <Link href="/login?tab=signup">Get started</Link>
+                            <Link href="/login?tab=signup" prefetch={false}>Get started</Link>
                         </Button>
                     </div>
                     <Image
diff --git a/client/src/components/buttons/icon-button.tsx b/client/src/components/buttons/icon-button.tsx
index b576b4a..f4c43af 100644
--- a/client/src/components/buttons/icon-button.tsx
+++ b/client/src/components/buttons/icon-button.tsx
@@ -40,7 +40,7 @@ export function IconButton({
                     <a href={href} target="_blank" rel="noreferrer noopener">
                         {icon}
                     </a>
-                )) || <Link href={href}>{icon}</Link>
+                )) || <Link href={href} prefetch={false}>{icon}</Link>
             ) : (
                 icon
             )}
diff --git a/client/src/components/buttons/main-button.tsx b/client/src/components/buttons/main-button.tsx
index 2a14e4a..b3baf1f 100644
--- a/client/src/components/buttons/main-button.tsx
+++ b/client/src/components/buttons/main-button.tsx
@@ -37,7 +37,7 @@ export function MainButton({
     icon,
     href,
     onClick,
-    linkPrefetch = true,
+    linkPrefetch = false,
     linkProps = {},
 }: MainButtonProps) {
     const buttonContent = (
diff --git a/client/src/components/forms/create-lease-form.tsx b/client/src/components/forms/create-lease-form.tsx
index 8568554..3a4dd72 100644
--- a/client/src/components/forms/create-lease-form.tsx
+++ b/client/src/components/forms/create-lease-form.tsx
@@ -59,6 +59,7 @@ export function CreateLeaseForm({
                                 <Link
                                     href="/properties/create"
                                     className="link-primary"
+                                    prefetch={false}
                                 >
                                     create a new property
                                 </Link>
diff --git a/client/src/components/loading-spinner.tsx b/client/src/components/loading-spinner.tsx
index 3dea172..67fa97f 100644
--- a/client/src/components/loading-spinner.tsx
+++ b/client/src/components/loading-spinner.tsx
@@ -1,12 +1,27 @@
 import { cn } from "@/utils/tw-merge";
 
 interface LoadingSpinnerProps {
-    size?: number;
+    size?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
     loadingText?: string;
     textOff?: boolean;
     className?: string;
 }
 
+// Specify tailwind classes so tailwind builds these classes
+// https://stackoverflow.com/questions/71886011/why-tailwind-dynamic-class-is-not-present
+const sizeToTwClasses = {
+    1: "w-1 h-1",
+    2: "w-2 h-2",
+    3: "w-3 h-3",
+    4: "w-4 h-4",
+    5: "w-5 h-5",
+    6: "w-6 h-6",
+    7: "w-7 h-7",
+    8: "w-8 h-8",
+    9: "w-9 h-9",
+    10: "w-10 h-10",
+};
+
 export default function LoadingSpinner({
     size = 8,
     loadingText = "Loading...",
@@ -21,7 +36,7 @@ export default function LoadingSpinner({
             <div role="status">
                 <svg
                     aria-hidden="true"
-                    className={`inline w-${size} h-${size} mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-gray-600 dark:fill-gray-300`}
+                    className={`inline ${sizeToTwClasses[size]} mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-gray-600 dark:fill-gray-300`}
                     viewBox="0 0 100 101"
                     fill="none"
                     xmlns="http://www.w3.org/2000/svg"
diff --git a/client/src/components/sidebar.tsx b/client/src/components/sidebar.tsx
index 2ca7dd4..4f0eb03 100644
--- a/client/src/components/sidebar.tsx
+++ b/client/src/components/sidebar.tsx
@@ -85,7 +85,11 @@ export function Sidebar({ sideBarItems }: SidebarProps) {
                 <div className="px-3 lg:py-2 flex flex-col justify-between h-full">
                     <div>
                         <div className="flex items-center justify-between lg:mb-5 max-lg:mb-2 px-4">
-                            <Link href="/home" onClick={closeSidebar}>
+                            <Link
+                                href="/home"
+                                onClick={closeSidebar}
+                                prefetch={false}
+                            >
                                 <div className="flex items-center space-x-2">
                                     <Image
                                         alt="Logo"
@@ -129,6 +133,7 @@ export function Sidebar({ sideBarItems }: SidebarProps) {
                                                 <Link
                                                     href={item.href}
                                                     onClick={closeSidebar}
+                                                    prefetch={false}
                                                 >
                                                     {createIcon(item.icon)}
                                                     {item.name}
@@ -146,7 +151,7 @@ export function Sidebar({ sideBarItems }: SidebarProps) {
                                 className="w-full justify-start"
                                 asChild
                             >
-                                <Link href="/settings" onClick={closeSidebar}>
+                                <Link href="/settings" onClick={closeSidebar} prefetch={false}>
                                     <Settings
                                         size={20}
                                         strokeWidth={1}
diff --git a/client/src/middleware.ts b/client/src/middleware.ts
index f696a38..96df4c8 100644
--- a/client/src/middleware.ts
+++ b/client/src/middleware.ts
@@ -7,6 +7,8 @@ const protectedRoutes = [
     "/leases",
     "/tenants",
     "/maintenance",
+    "/messages",
+    "/settings",
 ];
 
 export function middleware(request: NextRequest) {
diff --git a/client/src/network/server/users.ts b/client/src/network/server/users.ts
index 6ff62f7..4b6d4e4 100644
--- a/client/src/network/server/users.ts
+++ b/client/src/network/server/users.ts
@@ -11,12 +11,13 @@ import { redirect } from "next/navigation";
 export const getSessionUser = async (): Promise<User> => {
     const cookie = cookies().get("connect.sid");
     if (!cookie) {
+        console.error("No cookie found");
         throw new UnauthorizedError("Not logged in");
     }
 
     const response = await fetchDataServer("/users/me", {
         next: {
-            revalidate: 30,
+            revalidate: 0,
         },
     });
     return await response.json();
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6daa5f5..2649427 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -42,37 +42,37 @@ services:
         ports:
             - ${REDIS_INSIGHT_PORT}:8001
 
-    server:
-        build: ./server
-        ports:
-            - 5000:5000
-        depends_on:
-            - db
-            - redis
-        env_file:
-            - ./.env.server
-        networks:
-            - backend
+    # server:
+    #     build: ./server
+    #     ports:
+    #         - 5000:5000
+    #     depends_on:
+    #         - db
+    #         - redis
+    #     env_file:
+    #         - ./.env.server
+    #     networks:
+    #         - backend
 
-    client:
-        build: ./client
-        ports:
-            - 3000:3000
-        depends_on:
-            - server
-        networks:
-            - backend
+    # client:
+    #     build: ./client
+    #     ports:
+    #         - 3000:3000
+    #     depends_on:
+    #         - server
+    #     networks:
+    #         - backend
 
-    azure-function:
-        build: ./azure
-        ports:
-            - "7071:80"
-        env_file:
-            - ./.env.azure
-        volumes:
-            - ./etc/test-secrets:/azure-functions-host/Secrets
-        networks:
-            - backend
+    # azure-function:
+    #     build: ./azure
+    #     ports:
+    #         - "7071:80"
+    #     env_file:
+    #         - ./.env.azure
+    #     volumes:
+    #         - ./etc/test-secrets:/azure-functions-host/Secrets
+    #     networks:
+    #         - backend
         # depends_on:
         #     - azurite