diff --git a/src/lib/components/cards/RacePickCard.svelte b/src/lib/components/cards/RacePickCard.svelte
index dd6f50d..96f45e2 100644
--- a/src/lib/components/cards/RacePickCard.svelte
+++ b/src/lib/components/cards/RacePickCard.svelte
@@ -88,97 +88,89 @@
   let dnf_select_value: string = $state(racepick?.dnf ?? "");
 </script>
 
-{#await data.graphics then graphics}
-  {#await data.drivers then drivers}
-    <Card
-      imgsrc={get_by_value<Driver>(drivers, "id", racepick?.pxx ?? "")?.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()}
+{#await Promise.all([data.graphics, data.drivers]) then [graphics, drivers]}
+  <Card
+    imgsrc={get_by_value<Driver>(drivers, "id", racepick?.pxx ?? "")?.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()}
+  >
+    <form
+      method="POST"
+      enctype="multipart/form-data"
+      use:enhance
+      onsubmit={() => modalStore.close()}
     >
-      <form
-        method="POST"
-        enctype="multipart/form-data"
-        use:enhance
-        onsubmit={() => modalStore.close()}
-      >
-        <!-- This is also disabled, because the ID should only be -->
-        <!-- "leaked" to users that are allowed to use the inputs -->
-        {#if racepick && !disabled}
-          <input name="id" type="hidden" value={racepick.id} />
-        {/if}
+      <!-- This is also disabled, because the ID should only be -->
+      <!-- "leaked" to users that are allowed to use the inputs -->
+      {#if racepick && !disabled}
+        <input name="id" type="hidden" value={racepick.id} />
+      {/if}
 
-        <input name="user" type="hidden" value={data.user?.id} />
-        <input name="race" type="hidden" value={data.currentrace?.id} />
+      <input name="user" type="hidden" value={data.user?.id} />
+      <input name="race" type="hidden" value={data.currentrace?.id} />
 
-        <div class="flex flex-col gap-2">
-          <!-- PXX select -->
-          {#await active_drivers_and_substitutes then pxx_drivers}
-            <Dropdown
-              name="pxx"
-              input_variable={pxx_select_value}
-              action={register_pxx_preview_handler}
-              options={driver_dropdown_options(pxx_drivers)}
-              {labelwidth}
+      <div class="flex flex-col gap-2">
+        <!-- PXX select -->
+        {#await active_drivers_and_substitutes then pxx_drivers}
+          <Dropdown
+            name="pxx"
+            input_variable={pxx_select_value}
+            action={register_pxx_preview_handler}
+            options={driver_dropdown_options(pxx_drivers)}
+            {labelwidth}
+            {disabled}
+            {required}
+          >
+            P{data.currentrace?.pxx ?? "XX"}
+          </Dropdown>
+        {/await}
+
+        <!-- DNF select -->
+        {#await active_drivers_and_substitutes then pxx_drivers}
+          <Dropdown
+            name="dnf"
+            input_variable={dnf_select_value}
+            options={driver_dropdown_options(pxx_drivers)}
+            {labelwidth}
+            {disabled}
+            {required}
+          >
+            DNF
+          </Dropdown>
+        {/await}
+
+        <!-- Save/Delete buttons -->
+        <div class="flex justify-end gap-2">
+          {#if racepick}
+            <Button
+              formaction="?/update_racepick"
+              color="secondary"
               {disabled}
-              {required}
+              submit
+              width="w-1/2"
             >
-              P{data.currentrace?.pxx ?? "XX"}
-            </Dropdown>
-          {/await}
-
-          <!-- DNF select -->
-          {#await active_drivers_and_substitutes then pxx_drivers}
-            <Dropdown
-              name="dnf"
-              input_variable={dnf_select_value}
-              options={driver_dropdown_options(pxx_drivers)}
-              {labelwidth}
+              Save Changes
+            </Button>
+            <Button formaction="?/delete_racepick" color="primary" {disabled} submit width="w-1/2">
+              Delete
+            </Button>
+          {:else}
+            <Button
+              formaction="?/create_racepick"
+              color="tertiary"
               {disabled}
-              {required}
+              submit
+              width="w-full"
             >
-              DNF
-            </Dropdown>
-          {/await}
-
-          <!-- Save/Delete buttons -->
-          <div class="flex justify-end gap-2">
-            {#if racepick}
-              <Button
-                formaction="?/update_racepick"
-                color="secondary"
-                {disabled}
-                submit
-                width="w-1/2"
-              >
-                Save Changes
-              </Button>
-              <Button
-                formaction="?/delete_racepick"
-                color="primary"
-                {disabled}
-                submit
-                width="w-1/2"
-              >
-                Delete
-              </Button>
-            {:else}
-              <Button
-                formaction="?/create_racepick"
-                color="tertiary"
-                {disabled}
-                submit
-                width="w-full"
-              >
-                Make Pick
-              </Button>
-            {/if}
-          </div>
+              Make Pick
+            </Button>
+          {/if}
         </div>
-      </form>
-    </Card>
-  {/await}
+      </div>
+    </form>
+  </Card>
 {/await}
diff --git a/src/lib/components/cards/RaceResultCard.svelte b/src/lib/components/cards/RaceResultCard.svelte
index 2339592..f8fa07f 100644
--- a/src/lib/components/cards/RaceResultCard.svelte
+++ b/src/lib/components/cards/RaceResultCard.svelte
@@ -172,20 +172,18 @@
 
     <div class="mt-2 flex flex-col gap-2">
       <!-- PXXs autocomplete chips -->
-      {#await currentrace then current}
-        {#await pxxs_whitelist then whitelist}
-          <InputChip
-            bind:input={pxxs_input}
-            bind:value={pxxs_chips}
-            {whitelist}
-            allowUpperCase
-            placeholder="Select P{(current?.pxx ?? -10) - 3} to P{(current?.pxx ?? -10) + 3}..."
-            name="pxxs_codes"
-            {disabled}
-            {required}
-            on:remove={on_pxxs_chip_remove}
-          />
-        {/await}
+      {#await Promise.all([currentrace, pxxs_whitelist]) then [current, whitelist]}
+        <InputChip
+          bind:input={pxxs_input}
+          bind:value={pxxs_chips}
+          {whitelist}
+          allowUpperCase
+          placeholder="Select P{(current?.pxx ?? -10) - 3} to P{(current?.pxx ?? -10) + 3}..."
+          name="pxxs_codes"
+          {disabled}
+          {required}
+          on:remove={on_pxxs_chip_remove}
+        />
       {/await}
       <div class="card max-h-48 w-full overflow-y-auto p-2" tabindex="-1">
         {#await pxxs_options then options}
diff --git a/src/lib/components/cards/SubstitutionCard.svelte b/src/lib/components/cards/SubstitutionCard.svelte
index ad1414b..7fffa57 100644
--- a/src/lib/components/cards/SubstitutionCard.svelte
+++ b/src/lib/components/cards/SubstitutionCard.svelte
@@ -56,104 +56,102 @@
   let race_select_value: string = $state(substitution?.race ?? "");
 </script>
 
-{#await data.graphics then graphics}
-  {#await data.drivers then drivers}
-    <Card
-      imgsrc={get_by_value<Driver>(drivers, "id", substitution?.substitute ?? "")?.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()}
+{#await Promise.all([data.graphics, data.drivers]) then [graphics, drivers]}
+  <Card
+    imgsrc={get_by_value<Driver>(drivers, "id", substitution?.substitute ?? "")?.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()}
+  >
+    <form
+      method="POST"
+      enctype="multipart/form-data"
+      use:enhance
+      onsubmit={() => modalStore.close()}
     >
-      <form
-        method="POST"
-        enctype="multipart/form-data"
-        use:enhance
-        onsubmit={() => modalStore.close()}
-      >
-        <!-- This is also disabled, because the ID should only be -->
-        <!-- "leaked" to users that are allowed to use the inputs -->
-        {#if substitution && !disabled}
-          <input name="id" type="hidden" value={substitution.id} />
-        {/if}
+      <!-- This is also disabled, because the ID should only be -->
+      <!-- "leaked" to users that are allowed to use the inputs -->
+      {#if substitution && !disabled}
+        <input name="id" type="hidden" value={substitution.id} />
+      {/if}
 
-        <div class="flex flex-col gap-2">
-          <!-- Substitute select -->
+      <div class="flex flex-col gap-2">
+        <!-- Substitute select -->
+        <Dropdown
+          name="substitute"
+          input_variable={substitute_select_value}
+          action={register_substitute_preview_handler}
+          options={driver_dropdown_options(inactive_drivers(drivers))}
+          {labelwidth}
+          {disabled}
+          {required}
+        >
+          Substitute
+        </Dropdown>
+
+        <!-- Driver select -->
+        <Dropdown
+          name="for"
+          input_variable={driver_select_value}
+          options={driver_dropdown_options(active_drivers(drivers))}
+          {labelwidth}
+          {disabled}
+          {required}
+        >
+          For
+        </Dropdown>
+
+        <!-- Race select -->
+        {#await data.races then races}
           <Dropdown
-            name="substitute"
-            input_variable={substitute_select_value}
-            action={register_substitute_preview_handler}
-            options={driver_dropdown_options(inactive_drivers(drivers))}
+            name="race"
+            input_variable={race_select_value}
+            options={race_dropdown_options(races)}
             {labelwidth}
             {disabled}
             {required}
           >
-            Substitute
+            Race
           </Dropdown>
+        {/await}
 
-          <!-- Driver select -->
-          <Dropdown
-            name="for"
-            input_variable={driver_select_value}
-            options={driver_dropdown_options(active_drivers(drivers))}
-            {labelwidth}
-            {disabled}
-            {required}
-          >
-            For
-          </Dropdown>
-
-          <!-- Race select -->
-          {#await data.races then races}
-            <Dropdown
-              name="race"
-              input_variable={race_select_value}
-              options={race_dropdown_options(races)}
-              {labelwidth}
+        <!-- Save/Delete buttons -->
+        <div class="flex justify-end gap-2">
+          {#if substitution}
+            <Button
+              formaction="?/update_substitution"
+              color="secondary"
               {disabled}
-              {required}
+              submit
+              width="w-1/2"
             >
-              Race
-            </Dropdown>
-          {/await}
-
-          <!-- Save/Delete buttons -->
-          <div class="flex justify-end gap-2">
-            {#if substitution}
-              <Button
-                formaction="?/update_substitution"
-                color="secondary"
-                {disabled}
-                submit
-                width="w-1/2"
-              >
-                Save Changes
-              </Button>
-              <Button
-                formaction="?/delete_substitution"
-                color="primary"
-                {disabled}
-                submit
-                width="w-1/2"
-              >
-                Delete
-              </Button>
-            {:else}
-              <Button
-                formaction="?/create_substitution"
-                color="tertiary"
-                {disabled}
-                submit
-                width="w-full"
-              >
-                Create Substitution
-              </Button>
-            {/if}
-          </div>
+              Save Changes
+            </Button>
+            <Button
+              formaction="?/delete_substitution"
+              color="primary"
+              {disabled}
+              submit
+              width="w-1/2"
+            >
+              Delete
+            </Button>
+          {:else}
+            <Button
+              formaction="?/create_substitution"
+              color="tertiary"
+              {disabled}
+              submit
+              width="w-full"
+            >
+              Create Substitution
+            </Button>
+          {/if}
         </div>
-      </form>
-    </Card>
-  {/await}
+      </div>
+    </form>
+  </Card>
 {/await}