diff --git a/server/emails/sendEmail.ts b/server/emails/sendEmail.ts
index f8719e0f..2a3852f2 100644
--- a/server/emails/sendEmail.ts
+++ b/server/emails/sendEmail.ts
@@ -1,4 +1,4 @@
-import { render } from "@react-email/components";
+import { render } from "@react-email/render";
 import { ReactElement } from "react";
 import emailClient from "@server/emails";
 import logger from "@server/logger";
@@ -21,7 +21,9 @@ export async function sendEmail(
         return;
     }
 
+    logger.debug("Rendering email templatee...")
     const emailHtml = await render(template);
+    logger.debug("Done rendering email templatee")
 
     const options = {
         from: opts.from,
diff --git a/src/app/[orgId]/settings/access/roles/components/RolesDataTable.tsx b/src/app/[orgId]/settings/access/roles/components/RolesDataTable.tsx
index 3d42edc6..315d0bcc 100644
--- a/src/app/[orgId]/settings/access/roles/components/RolesDataTable.tsx
+++ b/src/app/[orgId]/settings/access/roles/components/RolesDataTable.tsx
@@ -76,7 +76,7 @@ export function RolesDataTable<TData, TValue>({
                         }
                         className="w-full pl-8"
                     />
-                    <Search className="h-5 w-5 absolute left-2 top-1/2 transform -translate-y-1/2" />
+                    <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2" />
                 </div>
                 <Button
                     onClick={() => {
diff --git a/src/app/[orgId]/settings/access/users/components/UsersDataTable.tsx b/src/app/[orgId]/settings/access/users/components/UsersDataTable.tsx
index 7de0395d..a35fd44c 100644
--- a/src/app/[orgId]/settings/access/users/components/UsersDataTable.tsx
+++ b/src/app/[orgId]/settings/access/users/components/UsersDataTable.tsx
@@ -76,7 +76,7 @@ export function UsersDataTable<TData, TValue>({
                         }
                         className="w-full pl-8"
                     />
-                    <Search className="h-5 w-5 absolute left-2 top-1/2 transform -translate-y-1/2" />
+                    <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2" />
                 </div>
                 <Button
                     onClick={() => {
diff --git a/src/app/[orgId]/settings/access/users/components/UsersTable.tsx b/src/app/[orgId]/settings/access/users/components/UsersTable.tsx
index 5e1591d3..0613a7d5 100644
--- a/src/app/[orgId]/settings/access/users/components/UsersTable.tsx
+++ b/src/app/[orgId]/settings/access/users/components/UsersTable.tsx
@@ -116,7 +116,10 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                     <>
                         <div className="flex items-center justify-end">
                             {userRow.isOwner && (
-                                <Button variant="ghost" className="opacity-0 cursor-default">
+                                <Button
+                                    variant="ghost"
+                                    className="opacity-0 cursor-default"
+                                >
                                     Placeholder
                                 </Button>
                             )}
@@ -161,18 +164,17 @@ export default function UsersTable({ users: u }: UsersTableProps) {
                                             )}
                                         </DropdownMenuContent>
                                     </DropdownMenu>
-                                    <Button
-                                        variant={"gray"}
-                                        className="ml-2"
-                                        onClick={() =>
-                                            router.push(
-                                                `/${org?.org.orgId}/settings/access/users/${userRow.id}`,
-                                            )
-                                        }
+                                    <Link
+                                        href={`/${org?.org.orgId}/settings/access/users/${userRow.id}`}
                                     >
-                                        Manage{" "}
-                                        <ArrowRight className="ml-2 w-4 h-4" />
-                                    </Button>
+                                        <Button
+                                            variant={"gray"}
+                                            className="ml-2"
+                                        >
+                                            Manage
+                                            <ArrowRight className="ml-2 w-4 h-4" />
+                                        </Button>
+                                    </Link>
                                 </>
                             )}
                         </div>
diff --git a/src/app/[orgId]/settings/components/Header.tsx b/src/app/[orgId]/settings/components/Header.tsx
index f4e6045e..35a7f22a 100644
--- a/src/app/[orgId]/settings/components/Header.tsx
+++ b/src/app/[orgId]/settings/components/Header.tsx
@@ -149,7 +149,7 @@ export default function Header({ email, orgId, name, orgs }: HeaderProps) {
                                 size="lg"
                                 role="combobox"
                                 aria-expanded={open}
-                                className="w-full md:w-[200px] h-12 px-3 py-4 bg-neutral hover:bg-muted"
+                                className="w-full md:w-[200px] h-12 px-3 py-4 bg-neutral hover:bg-neutral"
                             >
                                 <div className="flex items-center justify-between w-full">
                                     <div className="flex flex-col items-start">
@@ -202,29 +202,6 @@ export default function Header({ email, orgId, name, orgs }: HeaderProps) {
                             </Command>
                         </PopoverContent>
                     </Popover>
-
-                    {/* <Select
-                        defaultValue={orgId}
-                        onValueChange={(val) => {
-                            router.push(`/${val}/settings`);
-                        }}
-                    >
-                        <SelectTrigger className="w-[100px] md:w-[180px]">
-                            <SelectValue placeholder="Select an org" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectGroup>
-                                {orgs.map((org) => (
-                                    <SelectItem
-                                        value={org.name}
-                                        key={org.orgId}
-                                    >
-                                        {org.name}
-                                    </SelectItem>
-                                ))}
-                            </SelectGroup>
-                        </SelectContent>
-                    </Select> */}
                 </div>
             </div>
         </>
diff --git a/src/app/[orgId]/settings/resources/components/ResourcesDataTable.tsx b/src/app/[orgId]/settings/resources/components/ResourcesDataTable.tsx
index 6d04c9ad..2ffad8c1 100644
--- a/src/app/[orgId]/settings/resources/components/ResourcesDataTable.tsx
+++ b/src/app/[orgId]/settings/resources/components/ResourcesDataTable.tsx
@@ -77,7 +77,7 @@ export function ResourcesDataTable<TData, TValue>({
                         }
                         className="w-full pl-8"
                     />
-                    <Search className="h-5 w-5 absolute left-2 top-1/2 transform -translate-y-1/2" />
+                    <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2" />
                 </div>
                 <Button
                     onClick={() => {
diff --git a/src/app/[orgId]/settings/resources/components/ResourcesTable.tsx b/src/app/[orgId]/settings/resources/components/ResourcesTable.tsx
index 0b6ac196..137b398a 100644
--- a/src/app/[orgId]/settings/resources/components/ResourcesTable.tsx
+++ b/src/app/[orgId]/settings/resources/components/ResourcesTable.tsx
@@ -253,17 +253,14 @@ export default function SitesTable({ resources, orgId }: ResourcesTableProps) {
                                     </DropdownMenuItem>
                                 </DropdownMenuContent>
                             </DropdownMenu>
-                            <Button
-                                variant={"gray"}
-                                className="ml-2"
-                                onClick={() =>
-                                    router.push(
-                                        `/${resourceRow.orgId}/settings/resources/${resourceRow.id}`,
-                                    )
-                                }
+                            <Link
+                                href={`/${resourceRow.orgId}/settings/resources/${resourceRow.id}`}
                             >
-                                Edit <ArrowRight className="ml-2 w-4 h-4" />
-                            </Button>
+                                <Button variant={"gray"} className="ml-2">
+                                    Edit
+                                    <ArrowRight className="ml-2 w-4 h-4" />
+                                </Button>
+                            </Link>
                         </div>
                     </>
                 );
diff --git a/src/app/[orgId]/settings/sites/components/SitesDataTable.tsx b/src/app/[orgId]/settings/sites/components/SitesDataTable.tsx
index e4e8af59..c538e3b9 100644
--- a/src/app/[orgId]/settings/sites/components/SitesDataTable.tsx
+++ b/src/app/[orgId]/settings/sites/components/SitesDataTable.tsx
@@ -77,7 +77,7 @@ export function SitesDataTable<TData, TValue>({
                         }
                         className="w-full pl-8"
                     />
-                    <Search className="h-5 w-5 absolute left-2 top-1/2 transform -translate-y-1/2" />
+                    <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2" />
                 </div>
                 <Button
                     onClick={() => {
diff --git a/src/app/[orgId]/settings/sites/components/SitesTable.tsx b/src/app/[orgId]/settings/sites/components/SitesTable.tsx
index 67597861..1ab69278 100644
--- a/src/app/[orgId]/settings/sites/components/SitesTable.tsx
+++ b/src/app/[orgId]/settings/sites/components/SitesTable.tsx
@@ -202,17 +202,14 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
                                 </DropdownMenuItem>
                             </DropdownMenuContent>
                         </DropdownMenu>
-                        <Button
-                            variant={"gray"}
-                            className="ml-2"
-                            onClick={() =>
-                                router.push(
-                                    `/${siteRow.orgId}/settings/sites/${siteRow.nice}`,
-                                )
-                            }
+                        <Link
+                            href={`/${siteRow.orgId}/settings/sites/${siteRow.nice}`}
                         >
-                            Edit <ArrowRight className="ml-2 w-4 h-4" />
-                        </Button>
+                            <Button variant={"gray"} className="ml-2">
+                                Edit
+                                <ArrowRight className="ml-2 w-4 h-4" />
+                            </Button>
+                        </Link>
                     </div>
                 );
             },
diff --git a/src/app/setup/layout.tsx b/src/app/setup/layout.tsx
index 00fb0917..e0e4954f 100644
--- a/src/app/setup/layout.tsx
+++ b/src/app/setup/layout.tsx
@@ -1,4 +1,7 @@
+import { verifySession } from "@app/lib/auth/verifySession";
 import { Metadata } from "next";
+import { redirect } from "next/navigation";
+import { cache } from "react";
 
 export const metadata: Metadata = {
     title: `Setup - Pangolin`,
@@ -10,5 +13,12 @@ export default async function SetupLayout({
 }: {
     children: React.ReactNode;
 }) {
+    const getUser = cache(verifySession);
+    const user = await getUser();
+
+    if (!user) {
+        redirect("/");
+    }
+
     return <div className="mt-32">{children}</div>;
 }
diff --git a/src/app/setup/page.tsx b/src/app/setup/page.tsx
index fe423f9a..95b71e01 100644
--- a/src/app/setup/page.tsx
+++ b/src/app/setup/page.tsx
@@ -44,7 +44,7 @@ export default function StepperForm() {
 
     const debouncedCheckOrgIdAvailability = useCallback(
         debounce(checkOrgIdAvailability, 300),
-        [checkOrgIdAvailability]
+        [checkOrgIdAvailability],
     );
 
     useEffect(() => {
@@ -278,7 +278,7 @@ export default function StepperForm() {
 
 function debounce<T extends (...args: any[]) => any>(
     func: T,
-    wait: number
+    wait: number,
 ): (...args: Parameters<T>) => void {
     let timeout: NodeJS.Timeout | null = null;