diff --git a/src/lib/components/cards/DriverCard.svelte b/src/lib/components/cards/DriverCard.svelte
index caab369..f8302ff 100644
--- a/src/lib/components/cards/DriverCard.svelte
+++ b/src/lib/components/cards/DriverCard.svelte
@@ -147,93 +147,79 @@
   };
 </script>
 
-{#await data.graphics then graphics}
-  <Card
-    imgsrc={driver?.headshot_url ?? get_driver_headshot_template(graphics)}
-    imgid="headshot_preview"
-    width="w-full sm:w-auto"
-    imgwidth={DRIVER_HEADSHOT_WIDTH}
-    imgheight={DRIVER_HEADSHOT_HEIGHT}
-    imgonclick={(event: Event) => modalStore.close()}
-  >
-    <div class="flex flex-col gap-2">
-      <!-- Driver name input -->
-      <Input
-        bind:value={firstname_input_value}
-        autocomplete="off"
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        First Name
-      </Input>
-      <Input
-        bind:value={lastname_input_value}
-        autocomplete="off"
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Last Name
-      </Input>
-      <Input
-        bind:value={code_input_value}
-        autocomplete="off"
-        minlength={3}
-        maxlength={3}
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Driver Code
-      </Input>
+<Card
+  imgsrc={driver?.headshot_url ?? get_driver_headshot_template(data.graphics)}
+  imgid="headshot_preview"
+  width="w-full sm:w-auto"
+  imgwidth={DRIVER_HEADSHOT_WIDTH}
+  imgheight={DRIVER_HEADSHOT_HEIGHT}
+  imgonclick={(event: Event) => modalStore.close()}
+>
+  <div class="flex flex-col gap-2">
+    <!-- Driver name input -->
+    <Input bind:value={firstname_input_value} autocomplete="off" {labelwidth} {disabled} {required}>
+      First Name
+    </Input>
+    <Input bind:value={lastname_input_value} autocomplete="off" {labelwidth} {disabled} {required}>
+      Last Name
+    </Input>
+    <Input
+      bind:value={code_input_value}
+      autocomplete="off"
+      minlength={3}
+      maxlength={3}
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      Driver Code
+    </Input>
 
-      <!-- Driver team input -->
-      {#await data.teams then teams}
-        <Dropdown
-          bind:value={team_select_value}
-          options={team_dropdown_options(teams)}
-          {labelwidth}
+    <!-- Driver team input -->
+    {#await data.teams then teams}
+      <Dropdown
+        bind:value={team_select_value}
+        options={team_dropdown_options(teams)}
+        {labelwidth}
+        {disabled}
+        {required}
+      >
+        Team
+      </Dropdown>
+    {/await}
+
+    <!-- Headshot upload -->
+    <FileDropzone
+      name="headshot"
+      bind:files={headshot_file_value}
+      onchange={get_image_preview_event_handler("headshot_preview")}
+      {disabled}
+      {required}
+    >
+      <svelte:fragment slot="message">
+        <span class="font-bold">Upload Headshot</span>
+      </svelte:fragment>
+    </FileDropzone>
+
+    <!-- Save/Delete buttons -->
+    <div class="flex items-center justify-end gap-2">
+      <div class="mr-auto">
+        <SlideToggle
+          name="active"
+          background="bg-primary-500"
+          active="bg-tertiary-500"
+          bind:checked={active_value}
           {disabled}
-          {required}
-        >
-          Team
-        </Dropdown>
-      {/await}
-
-      <!-- Headshot upload -->
-      <FileDropzone
-        name="headshot"
-        bind:files={headshot_file_value}
-        onchange={get_image_preview_event_handler("headshot_preview")}
-        {disabled}
-        {required}
-      >
-        <svelte:fragment slot="message">
-          <span class="font-bold">Upload Headshot</span>
-        </svelte:fragment>
-      </FileDropzone>
-
-      <!-- Save/Delete buttons -->
-      <div class="flex items-center justify-end gap-2">
-        <div class="mr-auto">
-          <SlideToggle
-            name="active"
-            background="bg-primary-500"
-            active="bg-tertiary-500"
-            bind:checked={active_value}
-            {disabled}
-          />
-        </div>
-        {#if driver}
-          <Button onclick={update_driver()} color="secondary" {disabled} width="w-1/2">Save</Button>
-          <Button onclick={delete_driver} color="primary" {disabled} width="w-1/2">Delete</Button>
-        {:else}
-          <Button onclick={update_driver(true)} color="tertiary" {disabled} width="w-full">
-            Create Driver
-          </Button>
-        {/if}
+        />
       </div>
+      {#if driver}
+        <Button onclick={update_driver()} color="secondary" {disabled} width="w-1/2">Save</Button>
+        <Button onclick={delete_driver} color="primary" {disabled} width="w-1/2">Delete</Button>
+      {:else}
+        <Button onclick={update_driver(true)} color="tertiary" {disabled} width="w-full">
+          Create Driver
+        </Button>
+      {/if}
     </div>
-  </Card>
-{/await}
+  </div>
+</Card>
diff --git a/src/lib/components/cards/RaceCard.svelte b/src/lib/components/cards/RaceCard.svelte
index 7de0d0c..f669fb1 100644
--- a/src/lib/components/cards/RaceCard.svelte
+++ b/src/lib/components/cards/RaceCard.svelte
@@ -173,121 +173,114 @@
   };
 </script>
 
-{#await data.graphics then graphics}
-  <Card
-    imgsrc={race?.pictogram_url ?? get_race_pictogram_template(graphics)}
-    imgid="pictogram_preview"
-    width="w-full sm:w-auto"
-    imgwidth={RACE_PICTOGRAM_WIDTH}
-    imgheight={RACE_PICTOGRAM_HEIGHT}
-    imgonclick={(event: Event) => modalStore.close()}
-  >
-    <div class="flex flex-col gap-2">
-      <!-- Driver name input -->
-      <Input bind:value={name_value} autocomplete="off" {labelwidth} {disabled} {required}>
-        Name
-      </Input>
-      <Input
-        bind:value={step_value}
-        autocomplete="off"
-        type="number"
-        min={1}
-        max={24}
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Step
-      </Input>
-      <Input
-        bind:value={pxx_value}
-        autocomplete="off"
-        type="number"
-        min={1}
-        max={20}
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        PXX
-      </Input>
+<Card
+  imgsrc={race?.pictogram_url ?? get_race_pictogram_template(data.graphics)}
+  imgid="pictogram_preview"
+  width="w-full sm:w-auto"
+  imgwidth={RACE_PICTOGRAM_WIDTH}
+  imgheight={RACE_PICTOGRAM_HEIGHT}
+  imgonclick={(event: Event) => modalStore.close()}
+>
+  <div class="flex flex-col gap-2">
+    <!-- Driver name input -->
+    <Input bind:value={name_value} autocomplete="off" {labelwidth} {disabled} {required}>
+      Name
+    </Input>
+    <Input
+      bind:value={step_value}
+      autocomplete="off"
+      type="number"
+      min={1}
+      max={24}
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      Step
+    </Input>
+    <Input
+      bind:value={pxx_value}
+      autocomplete="off"
+      type="number"
+      min={1}
+      max={20}
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      PXX
+    </Input>
 
-      <!-- NOTE: Input datetime-local accepts YYYY-mm-ddTHH:MM format -->
-      <Input
-        id="sqdate"
-        bind:value={sprintqualidate_value}
-        autocomplete="off"
-        type="datetime-local"
-        {labelwidth}
-        {disabled}
-      >
-        SQuali
-      </Input>
-      <Input
-        id="sdate"
-        bind:value={sprintdate_value}
-        autocomplete="off"
-        type="datetime-local"
-        {labelwidth}
-        {disabled}
-      >
-        SRace
-      </Input>
-      <Input
-        bind:value={qualidate_value}
-        autocomplete="off"
-        type="datetime-local"
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Quali
-      </Input>
-      <Input
-        bind:value={racedate_value}
-        autocomplete="off"
-        type="datetime-local"
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Race
-      </Input>
+    <!-- NOTE: Input datetime-local accepts YYYY-mm-ddTHH:MM format -->
+    <Input
+      id="sqdate"
+      bind:value={sprintqualidate_value}
+      autocomplete="off"
+      type="datetime-local"
+      {labelwidth}
+      {disabled}
+    >
+      SQuali
+    </Input>
+    <Input
+      id="sdate"
+      bind:value={sprintdate_value}
+      autocomplete="off"
+      type="datetime-local"
+      {labelwidth}
+      {disabled}
+    >
+      SRace
+    </Input>
+    <Input
+      bind:value={qualidate_value}
+      autocomplete="off"
+      type="datetime-local"
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      Quali
+    </Input>
+    <Input
+      bind:value={racedate_value}
+      autocomplete="off"
+      type="datetime-local"
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      Race
+    </Input>
 
-      <!-- Headshot upload -->
-      <FileDropzone
-        name="pictogram"
-        onchange={get_image_preview_event_handler("pictogram_preview")}
-        bind:files={pictogram_value}
-        {disabled}
-        {required}
-      >
-        <svelte:fragment slot="message">
-          <span class="font-bold">Upload Pictogram</span>
-        </svelte:fragment>
-      </FileDropzone>
+    <!-- Headshot upload -->
+    <FileDropzone
+      name="pictogram"
+      onchange={get_image_preview_event_handler("pictogram_preview")}
+      bind:files={pictogram_value}
+      {disabled}
+      {required}
+    >
+      <svelte:fragment slot="message">
+        <span class="font-bold">Upload Pictogram</span>
+      </svelte:fragment>
+    </FileDropzone>
 
-      <!-- Save/Delete buttons -->
-      <div class="flex justify-end gap-2">
-        <Button
-          onclick={clear_sprint}
-          color="secondary"
-          {disabled}
-          width={race ? "w-1/3" : "w-1/2"}
-        >
-          Remove Sprint
+    <!-- Save/Delete buttons -->
+    <div class="flex justify-end gap-2">
+      <Button onclick={clear_sprint} color="secondary" {disabled} width={race ? "w-1/3" : "w-1/2"}>
+        Remove Sprint
+      </Button>
+      {#if race}
+        <Button onclick={update_race()} color="secondary" {disabled} width="w-1/3">
+          Save Changes
         </Button>
-        {#if race}
-          <Button onclick={update_race()} color="secondary" {disabled} width="w-1/3">
-            Save Changes
-          </Button>
-          <Button onclick={delete_race} color="primary" {disabled} width="w-1/3">Delete</Button>
-        {:else}
-          <Button onclick={update_race(true)} color="tertiary" {disabled} width="w-1/2">
-            Create Race
-          </Button>
-        {/if}
-      </div>
+        <Button onclick={delete_race} color="primary" {disabled} width="w-1/3">Delete</Button>
+      {:else}
+        <Button onclick={update_race(true)} color="tertiary" {disabled} width="w-1/2">
+          Create Race
+        </Button>
+      {/if}
     </div>
-  </Card>
-{/await}
+  </div>
+</Card>
diff --git a/src/lib/components/cards/TeamCard.svelte b/src/lib/components/cards/TeamCard.svelte
index 6bf287a..b5db8c2 100644
--- a/src/lib/components/cards/TeamCard.svelte
+++ b/src/lib/components/cards/TeamCard.svelte
@@ -176,83 +176,81 @@
   };
 </script>
 
-{#await data.graphics then graphics}
-  <Card
-    imgsrc={team?.banner_url ?? get_team_banner_template(graphics)}
-    imgid="banner_preview"
-    width="w-full sm:w-auto"
-    imgwidth={TEAM_BANNER_WIDTH}
-    imgheight={TEAM_BANNER_HEIGHT}
-    imgonclick={(event: Event) => modalStore.close()}
-  >
-    <div class="flex flex-col gap-2">
-      <!-- Team name input -->
-      <Input bind:value={name_value} autocomplete="off" {labelwidth} {disabled} {required}>
-        Name
-      </Input>
+<Card
+  imgsrc={team?.banner_url ?? get_team_banner_template(data.graphics)}
+  imgid="banner_preview"
+  width="w-full sm:w-auto"
+  imgwidth={TEAM_BANNER_WIDTH}
+  imgheight={TEAM_BANNER_HEIGHT}
+  imgonclick={(event: Event) => modalStore.close()}
+>
+  <div class="flex flex-col gap-2">
+    <!-- Team name input -->
+    <Input bind:value={name_value} autocomplete="off" {labelwidth} {disabled} {required}>
+      Name
+    </Input>
 
-      <!-- Team color input -->
-      <Input
-        bind:value={color_value}
-        autocomplete="off"
-        placeholder="Enter as '#XXXXXX'"
-        minlength={7}
-        maxlength={7}
-        {labelwidth}
-        {disabled}
-        {required}
-      >
-        Color
-        <span class="badge ml-2 border" style="color: {color_value}; background: {color_value}">
-          C
-        </span>
-      </Input>
+    <!-- Team color input -->
+    <Input
+      bind:value={color_value}
+      autocomplete="off"
+      placeholder="Enter as '#XXXXXX'"
+      minlength={7}
+      maxlength={7}
+      {labelwidth}
+      {disabled}
+      {required}
+    >
+      Color
+      <span class="badge ml-2 border" style="color: {color_value}; background: {color_value}">
+        C
+      </span>
+    </Input>
 
-      <!-- Banner upload -->
-      <FileDropzone
-        name="banner"
-        bind:files={banner_value}
-        onchange={get_image_preview_event_handler("banner_preview")}
-        {disabled}
-        {required}
-      >
-        <svelte:fragment slot="message">
-          <span class="font-bold">Upload Banner</span>
-        </svelte:fragment>
-      </FileDropzone>
+    <!-- Banner upload -->
+    <FileDropzone
+      name="banner"
+      bind:files={banner_value}
+      onchange={get_image_preview_event_handler("banner_preview")}
+      {disabled}
+      {required}
+    >
+      <svelte:fragment slot="message">
+        <span class="font-bold">Upload Banner</span>
+      </svelte:fragment>
+    </FileDropzone>
 
-      <!-- Logo upload -->
-      <FileDropzone
-        name="logo"
-        bind:files={logo_value}
-        onchange={get_image_preview_event_handler("logo_preview")}
-        {disabled}
-        {required}
-      >
-        <svelte:fragment slot="message">
-          <div class="inline-flex flex-nowrap items-center gap-2">
-            <span class="font-bold">Upload Logo</span>
-            <LazyImage
-              src={team?.logo_url ?? get_team_logo_template(graphics)}
-              id="logo_preview"
-              imgwidth={32}
-              imgheight={32}
-            />
-          </div>
-        </svelte:fragment>
-      </FileDropzone>
+    <!-- Logo upload -->
+    <FileDropzone
+      name="logo"
+      bind:files={logo_value}
+      onchange={get_image_preview_event_handler("logo_preview")}
+      {disabled}
+      {required}
+    >
+      <svelte:fragment slot="message">
+        <div class="inline-flex flex-nowrap items-center gap-2">
+          <span class="font-bold">Upload Logo</span>
+          <LazyImage
+            src={team?.logo_url ?? get_team_logo_template(data.graphics)}
+            id="logo_preview"
+            imgwidth={32}
+            imgheight={32}
+          />
+        </div>
+      </svelte:fragment>
+    </FileDropzone>
 
-      <!-- Save/Delete buttons -->
-      <div class="flex justify-end gap-2">
-        {#if team}
-          <Button onclick={update_team()} color="secondary" {disabled} width="w-1/2">Save</Button>
-          <Button onclick={delete_team} color="primary" {disabled} width="w-1/2">Delete</Button>
-        {:else}
-          <Button onclick={update_team(true)} color="tertiary" {disabled} width="w-full">
-            Create Team
-          </Button>
-        {/if}
-      </div>
+    <!-- Save/Delete buttons -->
+    <div class="flex justify-end gap-2">
+      {#if team}
+        <Button onclick={update_team()} color="secondary" {disabled} width="w-1/2">Save</Button>
+        <Button onclick={delete_team} color="primary" {disabled} width="w-1/2">Delete</Button>
+      {:else}
+        <Button onclick={update_team(true)} color="tertiary" {disabled} width="w-full">
+          Create Team
+        </Button>
+      {/if}
     </div>
-  </Card>
-{/await}
+  </div>
+</Card>