diff --git a/public/assets/icons/arrow-left.svg b/public/assets/icons/arrow-left.svg
index 52dc05c6..f8ff17a2 100644
--- a/public/assets/icons/arrow-left.svg
+++ b/public/assets/icons/arrow-left.svg
@@ -1,3 +1,3 @@
 <svg width="30" height="30" viewBox="0 0 30 30" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4785 14.4789L12.4789 14.4785L15.7164 11.241C16.1948 10.7626 17.0003 11.1037 17.0003 11.7624V18.2374C17.0003 18.9068 16.1873 19.2423 15.7164 18.7714L12.4789 15.5339L12.4785 15.5335C12.4092 15.4643 12.3542 15.3821 12.3166 15.2916C12.2791 15.2012 12.2598 15.1042 12.2598 15.0062C12.2598 14.9082 12.2791 14.8112 12.3166 14.7207L11.8548 14.5292L12.3166 14.7207C12.3542 14.6303 12.4092 14.5481 12.4785 14.4789Z"/>
+<path d="M15.363 19.1119L12.1255 15.8744C12.0096 15.7588 11.9177 15.6214 11.8549 15.4702C11.7922 15.319 11.7599 15.1569 11.7599 14.9932C11.7599 14.8295 11.7922 14.6674 11.8549 14.5161C11.9177 14.3649 12.0096 14.2276 12.1255 14.1119L15.363 10.8744C16.1505 10.0994 17.5005 10.6494 17.5005 11.7619V18.2244C17.5005 19.3494 16.1505 19.8994 15.363 19.1119Z"/>
 </svg>
diff --git a/public/assets/icons/arrow-right.svg b/public/assets/icons/arrow-right.svg
index b25599ae..820e9c21 100644
--- a/public/assets/icons/arrow-right.svg
+++ b/public/assets/icons/arrow-right.svg
@@ -1,3 +1,3 @@
 <svg width="30" height="30" viewBox="0 0 30 30" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.6375 19.1126L17.875 15.8751C17.9909 15.7595 18.0828 15.6221 18.1455 15.4709C18.2083 15.3197 18.2406 15.1576 18.2406 14.9939C18.2406 14.8302 18.2083 14.6681 18.1455 14.5169C18.0828 14.3657 17.9909 14.2283 17.875 14.1126L14.6375 10.8751C13.85 10.1001 12.5 10.6501 12.5 11.7626V18.2251C12.5 19.3501 13.85 19.9001 14.6375 19.1126Z"/>
+<path d="M14.637 10.8881L17.8745 14.1256C17.9904 14.2412 18.0823 14.3786 18.1451 14.5298C18.2078 14.681 18.2401 14.8431 18.2401 15.0068C18.2401 15.1705 18.2078 15.3326 18.1451 15.4839C18.0823 15.6351 17.9904 15.7724 17.8745 15.8881L14.637 19.1256C13.8495 19.9006 12.4995 19.3506 12.4995 18.2381L12.4995 11.7756C12.4995 10.6506 13.8495 10.1006 14.637 10.8881Z"/>
 </svg>
diff --git a/src/components/admin/event/AdminPickupEvent/AdminPickupEventForm.tsx b/src/components/admin/event/AdminPickupEvent/AdminPickupEventForm.tsx
index d53ba189..5fb61cf0 100644
--- a/src/components/admin/event/AdminPickupEvent/AdminPickupEventForm.tsx
+++ b/src/components/admin/event/AdminPickupEvent/AdminPickupEventForm.tsx
@@ -25,6 +25,13 @@ interface IProps {
   upcomingEvents: PublicEvent[];
 }
 
+const parseProps = (isoStart: string, isoEnd: string, rawOrderLimit: string) => {
+  const start = new Date(isoStart).toISOString();
+  const end = new Date(isoEnd).toISOString();
+  const orderLimit = parseInt(`${rawOrderLimit}`, 10);
+  return { start, end, orderLimit };
+};
+
 export const completePickupEvent = async (uuid: UUID, token: string) => {
   try {
     await AdminEventManager.completePickupEvent({
@@ -89,18 +96,16 @@ const AdminPickupEventForm = ({ mode, defaultData = {}, token, upcomingEvents }:
       orderLimit: rawOrderLimit,
     } = formData;
 
-    const start = new Date(isoStart).toISOString();
-    const end = new Date(isoEnd).toISOString();
-    const orderLimit = parseInt(`${rawOrderLimit}`, 10);
-
     try {
+      const { start, end, orderLimit } = parseProps(isoStart, isoEnd, `${rawOrderLimit}`);
+
       const uuid = await AdminEventManager.createPickupEvent(token, {
         title,
         start,
         end,
         description,
         orderLimit,
-        linkedEventUuid,
+        linkedEventUuid: linkedEventUuid || null,
       });
       showToast('Pickup Event created successfully!', '', [
         {
@@ -110,7 +115,11 @@ const AdminPickupEventForm = ({ mode, defaultData = {}, token, upcomingEvents }:
       ]);
       router.push(`${config.admin.store.pickup}/${uuid}`);
     } catch (error) {
-      reportError('Could not create pickup event', error);
+      if (error instanceof RangeError) {
+        reportError('Invalid date, could not create pickup event', error);
+      } else {
+        reportError('Could not create pickup event', error);
+      }
     } finally {
       setLoading(false);
     }
@@ -128,13 +137,18 @@ const AdminPickupEventForm = ({ mode, defaultData = {}, token, upcomingEvents }:
       orderLimit: rawOrderLimit,
     } = formData;
 
-    const start = new Date(isoStart).toISOString();
-    const end = new Date(isoEnd).toISOString();
-    const orderLimit = parseInt(`${rawOrderLimit}`, 10);
-
     try {
+      const { start, end, orderLimit } = parseProps(isoStart, isoEnd, `${rawOrderLimit}`);
+
       await AdminEventManager.editPickupEvent({
-        pickupEvent: { title, start, end, description, orderLimit, linkedEventUuid },
+        pickupEvent: {
+          title,
+          start,
+          end,
+          description,
+          orderLimit,
+          linkedEventUuid: linkedEventUuid || null,
+        },
         uuid: defaultData.uuid ?? '',
         token: token,
 
@@ -153,7 +167,11 @@ const AdminPickupEventForm = ({ mode, defaultData = {}, token, upcomingEvents }:
         },
       });
     } catch (error) {
-      reportError('Could not save changes', error);
+      if (error instanceof RangeError) {
+        reportError("Invalid date, can't save changes", error);
+      } else {
+        reportError('Could not save changes', error);
+      }
     } finally {
       setLoading(false);
     }
diff --git a/src/components/common/PaginationControls/index.tsx b/src/components/common/PaginationControls/index.tsx
index 3e0ca0bf..ea1ffd05 100644
--- a/src/components/common/PaginationControls/index.tsx
+++ b/src/components/common/PaginationControls/index.tsx
@@ -1,5 +1,5 @@
-import LeftArrowIcon from '@/public/assets/icons/page-left-icon.svg';
-import RightArrowIcon from '@/public/assets/icons/page-right-icon.svg';
+import LeftArrowIcon from '@/public/assets/icons/arrow-left.svg';
+import RightArrowIcon from '@/public/assets/icons/arrow-right.svg';
 import { useEffect, useState } from 'react';
 import style from './style.module.scss';
 
@@ -54,7 +54,7 @@ const PaginationControls = ({ page, onPage, pages }: PaginationControlsProps) =>
             }
           }}
         />
-        <span>of</span>
+        <span>/</span>
         <span className={style.pageNumber}>{pages}</span>
       </div>
       <button
diff --git a/src/components/common/PaginationControls/style.module.scss b/src/components/common/PaginationControls/style.module.scss
index 2932e049..bc99245f 100644
--- a/src/components/common/PaginationControls/style.module.scss
+++ b/src/components/common/PaginationControls/style.module.scss
@@ -5,11 +5,15 @@
   justify-content: center;
 
   .paginationBtn {
-    background: none;
+    background: var(--theme-elevated-background);
+    border: 1px solid var(--theme-elevated-stroke);
+    border-radius: 50%;
+    color: var(--theme-primary-2);
     font-size: 0;
     padding: 0;
 
     &:disabled {
+      color: var(--theme-elevated-stroke);
       cursor: auto;
       opacity: 0.5;
     }
@@ -17,19 +21,24 @@
 
   .paginationText {
     align-items: center;
+    background-color: var(--theme-elevated-background);
+    border: 1px solid var(--theme-elevated-stroke);
+    border-radius: 1rem;
     display: flex;
     font-weight: bold;
-    gap: 1em;
+    gap: 0.5rem;
+    padding: 0.375rem 1rem;
 
     .pageNumber {
+      text-align: center;
       width: 24px;
 
       &:is(input) {
-        border: 1px solid var(--theme-text-on-background-1);
-        border-radius: 2px;
-        color: inherit;
+        background-color: inherit;
+        border-bottom: 1.5px solid var(--theme-text-on-background-1);
+        color: var(--theme-text-on-background-1);
         font: inherit;
-        height: 24px;
+        margin-bottom: -1.5px;
         text-align: center;
       }
     }
diff --git a/src/components/leaderboard/LeaderboardRow/style.module.scss b/src/components/leaderboard/LeaderboardRow/style.module.scss
index 66e2e859..3ec8bc53 100644
--- a/src/components/leaderboard/LeaderboardRow/style.module.scss
+++ b/src/components/leaderboard/LeaderboardRow/style.module.scss
@@ -23,18 +23,8 @@
   }
 
   &.flash {
-    animation: flash 2s;
-    @keyframes flash {
-      0%,
-      20%,
-      40%,
-      60% {
-        background-color: var(--theme-background);
-        color: var(--theme-text-on-background-1);
-      }
-
-      10%,
-      30%,
+    animation: blinker 2s;
+    @keyframes blinker {
       50% {
         background-color: var(--theme-primary-2);
         color: var(--theme-background);
@@ -78,7 +68,6 @@
     }
 
     .rank {
-      color: var(--theme-text-on-surface-1);
       opacity: 0.5;
       text-align: center;
 
diff --git a/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts b/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts
index 0fde0f5d..2ef7150d 100644
--- a/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts
+++ b/src/components/leaderboard/LeaderboardRow/style.module.scss.d.ts
@@ -1,4 +1,5 @@
 export type Styles = {
+  blinker: string;
   flash: string;
   match: string;
   name: string;
diff --git a/src/pages/admin/store/pickup/index.tsx b/src/pages/admin/store/pickup/index.tsx
index 5e4b898c..881891e4 100644
--- a/src/pages/admin/store/pickup/index.tsx
+++ b/src/pages/admin/store/pickup/index.tsx
@@ -52,9 +52,13 @@ const AdminPickupPage = ({ futurePickupEvents, pastPickupEvents }: AdminPickupPa
         </div>
       </div>
       <div className={styles.cardContainer}>
-        {displayPickupEvents.map(pickupEvent => (
-          <PickupEventCard pickupEvent={pickupEvent} key={pickupEvent.uuid} />
-        ))}
+        {displayPickupEvents
+          .sort((x, y) => {
+            return Date.parse(x.start) - Date.parse(y.start);
+          })
+          .map(pickupEvent => (
+            <PickupEventCard pickupEvent={pickupEvent} key={pickupEvent.uuid} />
+          ))}
       </div>
     </div>
   );
diff --git a/src/styles/pages/leaderboard.module.scss b/src/styles/pages/leaderboard.module.scss
index b8d91917..50e3fc34 100644
--- a/src/styles/pages/leaderboard.module.scss
+++ b/src/styles/pages/leaderboard.module.scss
@@ -8,9 +8,8 @@
   max-width: 60rem;
 
   .header {
-    align-items: center;
     display: flex;
-    gap: 0 2rem;
+    gap: 1rem 2rem;
 
     @media (max-width: vars.$breakpoint-lg) {
       display: grid;
@@ -22,6 +21,7 @@
     }
 
     .heading {
+      align-self: center;
       font-size: 1.5rem;
       justify-self: start;
       letter-spacing: 1%;
@@ -32,13 +32,13 @@
     .myPosition {
       align-items: center;
       background-color: var(--theme-primary-2);
-      border-radius: 1rem;
+      border: 1px solid var(--theme-elevated-stroke);
+      border-radius: 2rem;
       color: var(--theme-background);
       display: flex;
       font-size: 1rem;
       font-weight: bold;
       gap: 0.5rem;
-      height: 2rem;
       justify-self: start;
       padding: 0 1rem;
 
@@ -52,13 +52,13 @@
       background: none;
       background-color: var(--theme-elevated-background);
       border: 1px solid var(--theme-elevated-stroke);
-      border-radius: 1rem;
+      border-radius: 2rem;
       color: inherit;
-      font-size: 14px;
-      height: 2rem;
+      font-size: 1rem;
       max-width: 18rem;
-      padding-left: 1.5rem;
+      padding-left: 1rem;
       padding-right: 0.5rem;
+
       width: 100%;
 
       &::placeholder {
@@ -66,8 +66,17 @@
       }
     }
 
-    .timeDropdown select {
-      text-align: right;
+    .timeDropdown {
+      background-color: var(--theme-elevated-background);
+      border: 1px solid var(--theme-elevated-stroke);
+      border-radius: 2rem;
+      padding: 0.5rem 1rem;
+
+      > select {
+        font-size: 1rem;
+        font-weight: normal;
+        line-height: 1.25rem;
+      }
     }
   }