diff --git a/pkgs/clan-cli/clan_cli/api/iwd.py b/pkgs/clan-cli/clan_cli/api/iwd.py
index 63501608e..387a337f2 100644
--- a/pkgs/clan-cli/clan_cli/api/iwd.py
+++ b/pkgs/clan-cli/clan_cli/api/iwd.py
@@ -28,14 +28,23 @@ def instance_name(machine_name: str) -> str:
 
 
 @API.register
-def get_iwd_service(base_url: str, machine_name: str) -> ServiceIwd | None:
+def get_iwd_service(base_url: str, machine_name: str) -> ServiceIwd:
     """
     Return the admin service of a clan.
 
     There is only one admin service. This might be changed in the future
     """
     inventory = load_inventory_eval(base_url)
-    return inventory.services.iwd.get(instance_name(machine_name))
+    service_config = inventory.services.iwd.get(instance_name(machine_name))
+    if service_config:
+        return service_config
+
+    # Empty service
+    return ServiceIwd(
+        meta=ServiceMeta(name="wifi_0"),
+        roles=ServiceIwdRole(default=ServiceIwdRoleDefault(machines=[machine_name])),
+        config=IwdConfig(networks={}),
+    )
 
 
 @dataclass
diff --git a/pkgs/webview-ui/app/src/components/TextInput.tsx b/pkgs/webview-ui/app/src/components/TextInput.tsx
index 8c735edf0..a73ef02c9 100644
--- a/pkgs/webview-ui/app/src/components/TextInput.tsx
+++ b/pkgs/webview-ui/app/src/components/TextInput.tsx
@@ -25,10 +25,6 @@ export function TextInput<T extends FieldValues, R extends ResponseData>(
 ) {
   const value = () => props.value;
 
-  createEffect(() => {
-    console.log("rendering text input", props.value);
-  });
-
   return (
     <label
       class={cx("form-control w-full", props.class)}
diff --git a/pkgs/webview-ui/app/src/hooks/index.ts b/pkgs/webview-ui/app/src/hooks/index.ts
index 629c8e452..5d6920fa9 100644
--- a/pkgs/webview-ui/app/src/hooks/index.ts
+++ b/pkgs/webview-ui/app/src/hooks/index.ts
@@ -19,3 +19,27 @@ export const registerClan = async () => {
     //
   }
 };
+
+/**
+ * Opens the custom file dialog
+ * Returns a native FileList to allow interaction with the native input type="file"
+ */
+export const selectSshKeys = async (): Promise<FileList> => {
+  const dataTransfer = new DataTransfer();
+
+  const response = await callApi("open_file", {
+    file_request: {
+      title: "Select SSH Key",
+      mode: "open_file",
+      initial_folder: "~/.ssh",
+    },
+  });
+  if (response.status === "success" && response.data) {
+    // Add synthetic files to the DataTransfer object
+    // FileList cannot be instantiated directly.
+    response.data.forEach((filename) => {
+      dataTransfer.items.add(new File([], filename));
+    });
+  }
+  return dataTransfer.files;
+};
diff --git a/pkgs/webview-ui/app/src/index.tsx b/pkgs/webview-ui/app/src/index.tsx
index e5a349ebc..ab94b097a 100644
--- a/pkgs/webview-ui/app/src/index.tsx
+++ b/pkgs/webview-ui/app/src/index.tsx
@@ -4,12 +4,14 @@ import { RouteDefinition, Router } from "@solidjs/router";
 
 import "./index.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query";
-import { MachineDetails } from "./routes/machines/[name]/view";
+import {
+  MachineDetails,
+  MachineListView,
+  CreateMachine,
+} from "./routes/machines";
 import { Layout } from "./layout/layout";
-import { MachineListView } from "./routes/machines/view";
 import { ClanList, CreateClan, ClanDetails } from "./routes/clans";
 import { Flash } from "./routes/flash/view";
-import { CreateMachine } from "./routes/machines/create";
 import { HostList } from "./routes/hosts/view";
 import { Welcome } from "./routes/welcome";
 import { Toaster } from "solid-toast";
diff --git a/pkgs/webview-ui/app/src/routes/clans/details.tsx b/pkgs/webview-ui/app/src/routes/clans/details.tsx
index 67a93ad0b..1620763de 100644
--- a/pkgs/webview-ui/app/src/routes/clans/details.tsx
+++ b/pkgs/webview-ui/app/src/routes/clans/details.tsx
@@ -68,7 +68,7 @@ const EditClanForm = (props: EditClanFormProps) => {
           <>
             <figure class="p-1">
               <div class="flex flex-col items-center">
-                <div class="text-3xl text-primary">{curr_name()}'s</div>
+                <div class="text-3xl text-primary">{curr_name()}</div>
                 <div class="text-secondary">Wide settings</div>
               </div>
             </figure>
@@ -257,11 +257,9 @@ const AdminModuleForm = (props: AdminModuleFormProps) => {
                               class="absolute -ml-4 size-full cursor-pointer opacity-0"
                               type="file"
                               onInput={async (e) => {
-                                console.log(e.target.files);
                                 if (!e.target.files) return;
 
                                 const content = await e.target.files[0].text();
-                                console.log(content);
                                 setValue(
                                   formStore,
                                   `allowedKeys.${idx()}.value`,
diff --git a/pkgs/webview-ui/app/src/routes/disk/view.tsx b/pkgs/webview-ui/app/src/routes/disk/view.tsx
index 5fcfe6bda..02eaf143b 100644
--- a/pkgs/webview-ui/app/src/routes/disk/view.tsx
+++ b/pkgs/webview-ui/app/src/routes/disk/view.tsx
@@ -16,10 +16,6 @@ export function DiskView() {
       }
     },
   }));
-  createEffect(() => {
-    // Example debugging the data
-    console.log(query);
-  });
   return (
     <div>
       <h1>Configure Disk</h1>
diff --git a/pkgs/webview-ui/app/src/routes/machines/[name]/view.tsx b/pkgs/webview-ui/app/src/routes/machines/details.tsx
similarity index 70%
rename from pkgs/webview-ui/app/src/routes/machines/[name]/view.tsx
rename to pkgs/webview-ui/app/src/routes/machines/details.tsx
index b6bdb69ec..821e9cea6 100644
--- a/pkgs/webview-ui/app/src/routes/machines/[name]/view.tsx
+++ b/pkgs/webview-ui/app/src/routes/machines/details.tsx
@@ -4,48 +4,40 @@ import { BackButton } from "@/src/components/BackButton";
 import { FileInput } from "@/src/components/FileInput";
 import { SelectInput } from "@/src/components/SelectInput";
 import { TextInput } from "@/src/components/TextInput";
-import { createForm, FieldValues, getValue, reset } from "@modular-forms/solid";
+import { selectSshKeys } from "@/src/hooks";
+import {
+  createForm,
+  FieldValues,
+  getValue,
+  reset,
+  setValue,
+} from "@modular-forms/solid";
 import { useParams } from "@solidjs/router";
-import { createQuery } from "@tanstack/solid-query";
-import { createSignal, For, Show, Switch, Match } from "solid-js";
+import { createQuery, QueryObserver } from "@tanstack/solid-query";
+import {
+  createSignal,
+  For,
+  Show,
+  Switch,
+  Match,
+  JSXElement,
+  createEffect,
+  createMemo,
+} from "solid-js";
 import toast from "solid-toast";
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type MachineFormInterface = MachineType & {
+type MachineFormInterface = MachineData & {
   sshKey?: File;
   disk?: string;
 };
 
-type MachineType = SuccessData<"get_inventory_machine_details">;
+type MachineData = SuccessData<"get_inventory_machine_details">;
 
 type Disks = SuccessQuery<"show_block_devices">["data"]["blockdevices"];
 
-/**
- * Opens the custom file dialog
- * Returns a native FileList to allow interaction with the native input type="file"
- */
-const selectSshKeys = async (): Promise<FileList> => {
-  const dataTransfer = new DataTransfer();
-
-  const response = await callApi("open_file", {
-    file_request: {
-      title: "Select SSH Key",
-      mode: "open_file",
-      initial_folder: "~/.ssh",
-    },
-  });
-  if (response.status === "success" && response.data) {
-    // Add synthetic files to the DataTransfer object
-    // FileList cannot be instantiated directly.
-    response.data.forEach((filename) => {
-      dataTransfer.items.add(new File([], filename));
-    });
-  }
-  return dataTransfer.files;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type InstallForm = { disk?: string };
+interface InstallForm extends FieldValues {
+  disk?: string;
+}
 
 interface InstallMachineProps {
   name?: string;
@@ -295,7 +287,11 @@ const InstallMachine = (props: InstallMachineProps) => {
 };
 
 interface MachineDetailsProps {
-  initialData: MachineType;
+  initialData: MachineData;
+  modules: {
+    name: string;
+    component: JSXElement;
+  }[];
 }
 const MachineForm = (props: MachineDetailsProps) => {
   const [formStore, { Form, Field }] =
@@ -363,7 +359,13 @@ const MachineForm = (props: MachineDetailsProps) => {
     const machine_response = await callApi("set_machine", {
       flake_url: curr_uri,
       machine_name: props.initialData.machine.name,
-      machine: values.machine,
+      machine: {
+        ...values.machine,
+        // TODO: Remove this workaround
+        tags: Array.from(
+          values.machine.tags || props.initialData.machine.tags || [],
+        ),
+      },
     });
     if (machine_response.status === "error") {
       toast.error(
@@ -416,30 +418,33 @@ const MachineForm = (props: MachineDetailsProps) => {
     }
   };
   return (
-    <div class="flex w-full justify-center">
-      <div class="m-2 w-full max-w-xl">
-        <Form onSubmit={handleSubmit}>
-          <div class="flex w-full justify-center p-2">
-            <div
-              class="avatar placeholder"
-              classList={{
-                online: onlineStatusQuery.data === "Online",
-                offline: onlineStatusQuery.data === "Offline",
-              }}
-            >
-              <div class="w-24 rounded-full bg-neutral text-neutral-content">
-                <Show
-                  when={onlineStatusQuery.isFetching}
-                  fallback={
-                    <span class="material-icons text-4xl">devices</span>
-                  }
-                >
-                  <span class="loading loading-bars loading-sm justify-self-end"></span>
-                </Show>
-              </div>
+    <>
+      <Form onSubmit={handleSubmit}>
+        <figure>
+          <div
+            class="avatar placeholder"
+            classList={{
+              online: onlineStatusQuery.data === "Online",
+              offline: onlineStatusQuery.data === "Offline",
+            }}
+          >
+            <div class="w-24 rounded-full bg-neutral text-neutral-content">
+              <Show
+                when={onlineStatusQuery.isFetching}
+                fallback={<span class="material-icons text-4xl">devices</span>}
+              >
+                <span class="loading loading-bars loading-sm justify-self-end"></span>
+              </Show>
             </div>
           </div>
-          <div class="my-2 w-full text-2xl">Details</div>
+        </figure>
+        <div class="card-body">
+          <span class="text-xl text-primary">General</span>
+          {/*
+          <Field name="machine.tags" type="string[]">
+            {(field, props) => field.value}
+          </Field> */}
+
           <Field name="machine.name">
             {(field, props) => (
               <TextInput
@@ -520,18 +525,34 @@ const MachineForm = (props: MachineDetailsProps) => {
             </div>
           </div>
 
-          <div class="my-2 w-full">
-            <button
-              class="btn btn-primary btn-wide"
-              type="submit"
-              disabled={!formStore.dirty}
-            >
-              Save
-            </button>
-          </div>
-        </Form>
-        <div class="my-2 w-full text-2xl">Remote Interactions</div>
-        <div class="my-2 flex w-full flex-col gap-2">
+          {
+            <div class="card-actions justify-end">
+              <button
+                class="btn btn-primary"
+                type="submit"
+                disabled={formStore.submitting || !formStore.dirty}
+              >
+                Save
+              </button>
+            </div>
+          }
+        </div>
+      </Form>
+
+      <div class="card-body">
+        <For each={props.modules}>
+          {(module) => (
+            <>
+              <div class="divider"></div>
+              <span class="text-xl text-primary">{module.name}</span>
+              {module.component}
+            </>
+          )}
+        </For>
+        <div class="divider"></div>
+
+        <span class="text-xl text-primary">Actions</span>
+        <div class="my-4 flex flex-col gap-6">
           <span class="max-w-md text-neutral">
             Installs the system for the first time. Used to bootstrap the remote
             device.
@@ -575,13 +596,15 @@ const MachineForm = (props: MachineDetailsProps) => {
           </div>
         </div>
       </div>
-    </div>
+    </>
   );
 };
 
+type WifiData = SuccessData<"get_iwd_service">;
+
 export const MachineDetails = () => {
   const params = useParams();
-  const query = createQuery(() => ({
+  const genericQuery = createQuery(() => ({
     queryKey: [
       activeURI(),
       "machine",
@@ -601,19 +624,61 @@ export const MachineDetails = () => {
     },
   }));
 
+  const wifiQuery = createQuery(() => ({
+    queryKey: [activeURI(), "machine", params.id, "get_iwd_service"],
+    queryFn: async () => {
+      const curr = activeURI();
+      if (curr) {
+        const result = await callApi("get_iwd_service", {
+          base_url: curr,
+          machine_name: params.id,
+        });
+        if (result.status === "error") throw new Error("Failed to fetch data");
+        return Object.entries(result.data?.config?.networks || {}).map(
+          ([name, value]) => ({ name, ssid: value.ssid }),
+        );
+      }
+    },
+  }));
+
   return (
-    <div class="p-2">
+    <div class="card">
       <BackButton />
       <Show
-        when={query.data}
+        when={genericQuery.data}
         fallback={<span class="loading loading-lg"></span>}
       >
         {(data) => (
           <>
-            <MachineForm initialData={data()} />
-            <MachineWifi
-              base_url={activeURI() || ""}
-              machine_name={data().machine.name}
+            <MachineForm
+              initialData={data()}
+              modules={[
+                {
+                  component: (
+                    <Show
+                      when={!wifiQuery.isLoading}
+                      fallback={
+                        <div>
+                          <span class="loading loading-lg"></span>
+                        </div>
+                      }
+                    >
+                      <Switch>
+                        <Match when={wifiQuery.data}>
+                          {(d) => (
+                            <WifiModule
+                              initialData={d()}
+                              base_url={activeURI() || ""}
+                              machine_name={data().machine.name}
+                            />
+                          )}
+                        </Match>
+                      </Switch>
+                    </Show>
+                  ),
+                  name: "Wifi",
+                },
+              ]}
             />
           </>
         )}
@@ -622,61 +687,128 @@ export const MachineDetails = () => {
   );
 };
 
+interface Wifi extends FieldValues {
+  name: string;
+  ssid?: string;
+  password?: string;
+}
+
 interface WifiForm extends FieldValues {
-  ssid: string;
-  password: string;
+  networks: Wifi[];
 }
 
 interface MachineWifiProps {
   base_url: string;
   machine_name: string;
+  initialData: Wifi[];
 }
-function MachineWifi(props: MachineWifiProps) {
-  const [formStore, { Form, Field }] = createForm<WifiForm>();
+function WifiModule(props: MachineWifiProps) {
+  // You can use formData to initialize your form fields:
+  // const initialFormState = formData();
+
+  const [formStore, { Form, Field }] = createForm<WifiForm>({
+    initialValues: {
+      networks: props.initialData,
+    },
+  });
+
+  const [nets, setNets] = createSignal<1[]>(
+    new Array(props.initialData.length || 1).fill(1),
+  );
 
   const handleSubmit = async (values: WifiForm) => {
-    console.log("submitting", values);
+    const networks = values.networks
+      .filter((i) => i.ssid)
+      .reduce(
+        (acc, curr) => ({
+          ...acc,
+          [curr.ssid || ""]: { ssid: curr.ssid, password: curr.password },
+        }),
+        {},
+      );
+
+    console.log("submitting", values, networks);
     const r = await callApi("set_iwd_service_for_machine", {
       base_url: props.base_url,
       machine_name: props.machine_name,
-      networks: {
-        [values.ssid]: { ssid: values.ssid, password: values.password },
-      },
+      networks: networks,
     });
+    if (r.status === "error") {
+      toast.error("Failed to set wifi");
+    }
+    if (r.status === "success") {
+      toast.success("Wifi set successfully");
+    }
   };
+
   return (
-    <div>
-      <h1>MachineWifi</h1>
-      <Form onSubmit={handleSubmit}>
-        <Field name="ssid">
-          {(field, props) => (
-            <TextInput
-              formStore={formStore}
-              inputProps={props}
-              label="Name"
-              value={field.value ?? ""}
-              error={field.error}
-              required
-            />
-          )}
-        </Field>
-        <Field name="password">
-          {(field, props) => (
-            <TextInput
-              formStore={formStore}
-              inputProps={props}
-              label="Password"
-              value={field.value ?? ""}
-              error={field.error}
-              type="password"
-              required
-            />
-          )}
-        </Field>
-        <button class="btn" type="submit">
-          <span>Submit</span>
-        </button>
-      </Form>
-    </div>
+    <Form onSubmit={handleSubmit}>
+      <span class="text-neutral">Preconfigure wireless networks</span>
+      <For each={nets()}>
+        {(_, idx) => (
+          <div class="flex gap-4">
+            <Field name={`networks.${idx()}.ssid`}>
+              {(field, props) => (
+                <TextInput
+                  formStore={formStore}
+                  inputProps={props}
+                  label="Name"
+                  value={field.value ?? ""}
+                  error={field.error}
+                  required
+                />
+              )}
+            </Field>
+            <Field name={`networks.${idx()}.password`}>
+              {(field, props) => (
+                <TextInput
+                  formStore={formStore}
+                  inputProps={props}
+                  label="Password"
+                  value={field.value ?? ""}
+                  error={field.error}
+                  type="password"
+                  required
+                />
+              )}
+            </Field>
+            <button class="btn btn-ghost self-end">
+              <span
+                class="material-icons"
+                onClick={(e) => {
+                  e.preventDefault();
+                  setNets((c) => c.filter((_, i) => i !== idx()));
+                  setValue(formStore, `networks.${idx()}.ssid`, undefined);
+                  setValue(formStore, `networks.${idx()}.password`, undefined);
+                }}
+              >
+                delete
+              </span>
+            </button>
+          </div>
+        )}
+      </For>
+      <button
+        class="btn btn-ghost btn-sm my-1 flex items-center justify-center"
+        onClick={(e) => {
+          e.preventDefault();
+          setNets([...nets(), 1]);
+        }}
+      >
+        <span class="material-icons">add</span>
+        Add Network
+      </button>
+      {
+        <div class="card-actions mt-4 justify-end">
+          <button
+            class="btn btn-primary"
+            type="submit"
+            disabled={formStore.submitting || !formStore.dirty}
+          >
+            Save
+          </button>
+        </div>
+      }
+    </Form>
   );
 }
diff --git a/pkgs/webview-ui/app/src/routes/machines/index.ts b/pkgs/webview-ui/app/src/routes/machines/index.ts
new file mode 100644
index 000000000..d7371c018
--- /dev/null
+++ b/pkgs/webview-ui/app/src/routes/machines/index.ts
@@ -0,0 +1,3 @@
+export * from "./details";
+export * from "./create";
+export * from "./list";
diff --git a/pkgs/webview-ui/app/src/routes/machines/view.tsx b/pkgs/webview-ui/app/src/routes/machines/list.tsx
similarity index 100%
rename from pkgs/webview-ui/app/src/routes/machines/view.tsx
rename to pkgs/webview-ui/app/src/routes/machines/list.tsx