diff --git a/src/components/TeamDetail.svelte b/src/components/TeamDetail.svelte
index f558332e..c7d2e8a2 100644
--- a/src/components/TeamDetail.svelte
+++ b/src/components/TeamDetail.svelte
@@ -8,13 +8,19 @@
   import store from "../store";
   import PromiseError from "./PromiseError.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
+  export let params;
+  let [teamdata, original, delete_team, orgs, modal_open] = [
+    {},
+    {},
+    {},
+    [],
+    false,
+  ];
   $: delete_triggered = false;
   $: save_enabled = !data_changed;
-  export let params;
-  let teamdata = {};
-  let original = {};
   $: data_loaded = false;
   $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original);
+  //
   const promise = RunnerTeamService.runnerTeamControllerGetOne(
     params.teamid
   ).then((value) => {
@@ -22,18 +28,9 @@
     teamdata = Object.assign(teamdata, value);
     original = Object.assign(original, value);
   });
-  $: orgs = [];
-  let modal_open = false;
-  let delete_team = {};
-  const orgs_promise = RunnerOrganisationService.runnerOrganisationControllerGetAll().then(
-    (val) => {
-      console.log(val);
-      orgs = val;
-      val.forEach((t) => {
-        console.log(t.name);
-      });
-    }
-  );
+  RunnerOrganisationService.runnerOrganisationControllerGetAll().then((val) => {
+    orgs = val;
+  });
   function deleteTeam() {
     RunnerTeamService.runnerTeamControllerRemove(original.id, true)
       .then((resp) => {
@@ -205,13 +202,17 @@
         name="contact"
         class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
     </div>
-    <select
-      bind:value={teamdata.parentGroup}
-      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2">
-      {#each orgs as o}
-        <option value={o.id}>{o.name}</option>
-      {/each}
-    </select>
+    <div class="text-sm w-full">
+      <label for="org" class="font-medium text-gray-700">Parent Organization</label>
+      <select
+        name="org"
+        bind:value={teamdata.parentGroup}
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2">
+        {#each orgs as o}
+          <option value={o.id}>{o.name}</option>
+        {/each}
+      </select>
+    </div>
   </section>
 {:else}
   {#await promise}