diff --git a/src/components/cards/AddCardBulkModal.svelte b/src/components/cards/AddCardBulkModal.svelte
index 03bddf33..27f9008d 100644
--- a/src/components/cards/AddCardBulkModal.svelte
+++ b/src/components/cards/AddCardBulkModal.svelte
@@ -119,7 +119,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w- rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -135,18 +135,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:mt-0 sm:text-left">
+            <div class="mt-3 sm:mt-0">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-bulk-blanco-cards")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "just-enter-how-many-you-want-and-the-system-will-create-them"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="amount"
@@ -183,7 +183,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/cards/AddCardModal.svelte b/src/components/cards/AddCardModal.svelte
index 58cfeebd..38c14e32 100644
--- a/src/components/cards/AddCardModal.svelte
+++ b/src/components/cards/AddCardModal.svelte
@@ -112,7 +112,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -128,11 +128,11 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:mt-0 sm:text-left">
+            <div class="mt-3 sm:mt-0">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-card")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_("you-can-provide-a-runner-but-you-dont-have-to")}
                   {$_(
@@ -140,7 +140,7 @@
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="donor"
@@ -165,7 +165,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/cards/CardDetailModal.svelte b/src/components/cards/CardDetailModal.svelte
index 4effb304..e03c0762 100644
--- a/src/components/cards/CardDetailModal.svelte
+++ b/src/components/cards/CardDetailModal.svelte
@@ -106,7 +106,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -122,16 +122,16 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("edit-a-card")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_("you-can-provide-a-runner-but-you-dont-have-to")}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="runner"
@@ -174,7 +174,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/cards/DeleteCardModal.svelte b/src/components/cards/DeleteCardModal.svelte
index cb6b02b1..46fb1a47 100644
--- a/src/components/cards/DeleteCardModal.svelte
+++ b/src/components/cards/DeleteCardModal.svelte
@@ -62,7 +62,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -78,7 +78,7 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("please-confirm-the-deletion-of-card")}
               </h3>
@@ -99,7 +99,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={submit}
             type="button"
diff --git a/src/components/contacts/AddContactModal.svelte b/src/components/contacts/AddContactModal.svelte
index 73ab8759..26f35e8c 100644
--- a/src/components/contacts/AddContactModal.svelte
+++ b/src/components/contacts/AddContactModal.svelte
@@ -164,7 +164,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -179,18 +179,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-contact")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-contact"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -454,7 +454,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/donations/AddDonationModal.svelte b/src/components/donations/AddDonationModal.svelte
index dc2546eb..a1d2657f 100644
--- a/src/components/donations/AddDonationModal.svelte
+++ b/src/components/donations/AddDonationModal.svelte
@@ -143,7 +143,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -158,7 +158,7 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left">
+            <div class="mt-3">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {#if is_fixed}
                   {$_("create-a-new-fixed-donation")}
@@ -177,14 +177,14 @@
                   >{$_("fixed-donation")}</span
                 >
               </label>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-nessecary-information-to-create-a-new-donation"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="donor"
@@ -289,7 +289,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/donations/AddDonationPaymentModal.svelte b/src/components/donations/AddDonationPaymentModal.svelte
index d130a342..eeaefb03 100644
--- a/src/components/donations/AddDonationPaymentModal.svelte
+++ b/src/components/donations/AddDonationPaymentModal.svelte
@@ -104,7 +104,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -124,14 +124,14 @@
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("enter-payment")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "you-can-enter-the-donations-paid-amount-manually-or-use-the-max-button-to-use-the-donations-exact-amount"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols gap-6">
+              <div class="grid grid-cols gap-2 lg:gap-6">
                 <div class="w-full">
                   <label
                     for="token"
@@ -179,7 +179,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/donations/DeleteDonationModal.svelte b/src/components/donations/DeleteDonationModal.svelte
index b21309ad..8ba4fbf4 100644
--- a/src/components/donations/DeleteDonationModal.svelte
+++ b/src/components/donations/DeleteDonationModal.svelte
@@ -65,7 +65,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -80,7 +80,7 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("please-confirm-the-deletion-of-donation")}
               </h3>
@@ -93,7 +93,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={submit}
             type="button"
diff --git a/src/components/donors/AddDonorModal.svelte b/src/components/donors/AddDonorModal.svelte
index 3fdb9a46..d2bb5d10 100644
--- a/src/components/donors/AddDonorModal.svelte
+++ b/src/components/donors/AddDonorModal.svelte
@@ -152,7 +152,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -167,18 +167,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left">
+            <div class="mt-3">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-donor")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-nessecary-information-to-add-a-new-donor"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -418,7 +418,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/donors/ConfirmDonorDeletion.svelte b/src/components/donors/ConfirmDonorDeletion.svelte
index e3e2d6c0..7364b50c 100644
--- a/src/components/donors/ConfirmDonorDeletion.svelte
+++ b/src/components/donors/ConfirmDonorDeletion.svelte
@@ -42,7 +42,7 @@
 				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
 					<div class="">
 						<div
-							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
 						>
 							<svg
 								class="h-6 w-6 text-blue-600"
@@ -54,13 +54,13 @@
 								/></svg
 							>
 						</div>
-						<div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
 							<h3 class="text-lg leading-6 font-medium text-gray-900">
 								{$_(
 									"do-you-want-to-delete-this-donor-with-all-related-donations"
 								)}
 							</h3>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">
 									{$_("all-associated-donations-will-get-deleted-as-well")}
 								</p>
@@ -68,7 +68,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
 					<button
 						on:click={deleteDonor}
 						type="button"
diff --git a/src/components/general/About.svelte b/src/components/general/About.svelte
index 62457f62..613b0671 100644
--- a/src/components/general/About.svelte
+++ b/src/components/general/About.svelte
@@ -52,7 +52,7 @@
 				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
 					<div class="">
 						<div
-							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
 						>
 							<svg
 								fill="currentColor"
@@ -71,16 +71,16 @@
 							<h3 class="text-lg leading-6 font-medium">
 								{$_("read-license")}
 							</h3>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">{currentlicense}</p>
 							</div>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">{licensetext}</p>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
 					<button
 						on:click={() => {
 							modal_open = false;
diff --git a/src/components/groups/AddGroupModal.svelte b/src/components/groups/AddGroupModal.svelte
index 1bba2c14..3271bdb7 100644
--- a/src/components/groups/AddGroupModal.svelte
+++ b/src/components/groups/AddGroupModal.svelte
@@ -87,7 +87,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -102,18 +102,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-user-group")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-for-creating-a-new-user-group"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -159,7 +159,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/orgs/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte
index dd721a2d..7bb2aaea 100644
--- a/src/components/orgs/AddOrgModal.svelte
+++ b/src/components/orgs/AddOrgModal.svelte
@@ -25,7 +25,7 @@
   $: address_input2_value = "";
   $: address_zipcode_value = "";
   $: address_city_value = "";
-  $: address_checked = true;
+  $: address_checked = false;
 
   let address_input1;
   let address_input2;
@@ -110,7 +110,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -124,18 +124,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-organization")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-organization"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -222,7 +222,7 @@
                       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-neutral-800 rounded-md p-2"
                     />
                   </div>
-                  <div class="col-span-6">
+                  <div class="col-span-2">
                     <label
                       for="zipcode"
                       class="block text-sm font-medium text-gray-700"
@@ -248,7 +248,7 @@
                       </span>
                     {/if}
                   </div>
-                  <div class="col-span-6">
+                  <div class="col-span-4">
                     <label
                       for="city"
                       class="block text-sm font-medium text-gray-700"
@@ -279,7 +279,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/orgs/ConfirmOrgDeletionModal.svelte b/src/components/orgs/ConfirmOrgDeletionModal.svelte
index 739af2d5..7c705116 100644
--- a/src/components/orgs/ConfirmOrgDeletionModal.svelte
+++ b/src/components/orgs/ConfirmOrgDeletionModal.svelte
@@ -53,7 +53,7 @@
 				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
 					<div class="">
 						<div
-							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
 						>
 							<svg
 								class="h-6 w-6 text-blue-600"
@@ -68,13 +68,13 @@
 								/></svg
 							>
 						</div>
-						<div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
 							<h3 class="text-lg leading-6 font-medium text-gray-900">
 								{$_("do-you-want-to-delete-the-organization-delete_org-name", {
 									values: { orgname: delete_org.name },
 								})}
 							</h3>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">
 									{$_("all-associated-teams-and-runners-will-be-deleted-too")}
 								</p>
@@ -82,7 +82,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
 					<button
 						on:click={deleteOrg}
 						type="button"
diff --git a/src/components/runners/AddRunnerModal.svelte b/src/components/runners/AddRunnerModal.svelte
index 98c64697..d511e97c 100644
--- a/src/components/runners/AddRunnerModal.svelte
+++ b/src/components/runners/AddRunnerModal.svelte
@@ -145,7 +145,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -160,18 +160,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-runner")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-runner"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -323,7 +323,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/runners/DeleteRunnerModal.svelte b/src/components/runners/DeleteRunnerModal.svelte
index 9d37a859..e41265a7 100644
--- a/src/components/runners/DeleteRunnerModal.svelte
+++ b/src/components/runners/DeleteRunnerModal.svelte
@@ -59,7 +59,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -74,7 +74,7 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_('delete_runner')}
               </h3>
@@ -86,7 +86,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={submit}
             type="button"
diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte
index b3eedb19..9017aa6a 100644
--- a/src/components/runners/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -215,7 +215,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl lg:rounded-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -230,15 +230,15 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:mt-0 sm:text-left w-full">
+            <div class="mt-3 sm:mt-0 sm:text-left w-full">
               <h3 class="text-lg leading-6 font-bold mt-2 text-gray-900">
                 {$_("runner-import")}
               </h3>
             </div>
           </div>
-          <div class="mt-5 text-center sm:mt-0 sm:text-left w-full">
+          <div class="sm:text-left w-full">
             {#if json_output.length === 0}
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_("please-provide-the-required-csv-xlsx-file")}
                 </p>
diff --git a/src/components/scans/AddScanModal.svelte b/src/components/scans/AddScanModal.svelte
index 70f422c5..6cf5b06d 100644
--- a/src/components/scans/AddScanModal.svelte
+++ b/src/components/scans/AddScanModal.svelte
@@ -96,7 +96,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -112,18 +112,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left">
+            <div class="mt-3">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-scan-fixed-only")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-nessecary-information-to-create-a-new-scan"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="donor"
@@ -180,7 +180,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/scans/DeleteScanModal.svelte b/src/components/scans/DeleteScanModal.svelte
index 549029f2..0c23e2a0 100644
--- a/src/components/scans/DeleteScanModal.svelte
+++ b/src/components/scans/DeleteScanModal.svelte
@@ -61,7 +61,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -76,17 +76,17 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("please-confirm-the-deletion-of-scan")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 #{delete_scan.id}
               </div>
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={submit}
             type="button"
diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte
index ba18fc98..2464bcbb 100644
--- a/src/components/scanstations/AddScanStationModal.svelte
+++ b/src/components/scanstations/AddScanStationModal.svelte
@@ -100,7 +100,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -115,18 +115,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:mt-0 sm:text-left">
+            <div class="mt-3 sm:mt-0">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-scanstation")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-create-a-new-scanstation"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="track"
@@ -188,7 +188,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/scanstations/ConfirmScanStationDeletion.svelte b/src/components/scanstations/ConfirmScanStationDeletion.svelte
index baa6bc8a..3ac88ab6 100644
--- a/src/components/scanstations/ConfirmScanStationDeletion.svelte
+++ b/src/components/scanstations/ConfirmScanStationDeletion.svelte
@@ -50,7 +50,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -62,11 +62,11 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("attention")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "do-you-want-to-delete-this-donor-with-all-related-donations"
@@ -78,7 +78,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={deleteStation}
             type="button"
diff --git a/src/components/scanstations/CopyScanStationTokenModal.svelte b/src/components/scanstations/CopyScanStationTokenModal.svelte
index 8a5741f4..05e1ebbf 100644
--- a/src/components/scanstations/CopyScanStationTokenModal.svelte
+++ b/src/components/scanstations/CopyScanStationTokenModal.svelte
@@ -83,7 +83,7 @@
 				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
 					<div class="">
 						<div
-							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
 						>
 							<svg
 								class="h-6 w-6 text-blue-600"
@@ -96,11 +96,11 @@
 								/></svg
 							>
 						</div>
-						<div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
 							<h3 class="text-lg leading-6 font-medium text-gray-900">
 								{$_("token")}
 							</h3>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">
 									{$_(
 										"the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again"
@@ -109,7 +109,7 @@
 									{$_("please-copy-the-token-and-store-it-somewhere-save")}
 								</p>
 							</div>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<label
 									for="token"
 									class="block text-sm font-medium text-gray-700"
@@ -184,7 +184,7 @@
 						/>
 					</div>
 				</div>
-				<div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
 					<button
 						on:click={close}
 						type="button"
diff --git a/src/components/settings/ConfirmProfileDeletion.svelte b/src/components/settings/ConfirmProfileDeletion.svelte
index 12fa9e72..78f61484 100644
--- a/src/components/settings/ConfirmProfileDeletion.svelte
+++ b/src/components/settings/ConfirmProfileDeletion.svelte
@@ -51,7 +51,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -63,11 +63,11 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("attention")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_("do-you-really-want-to-delete-your-profile")}
                   <br />
@@ -81,7 +81,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={deleteMe}
             type="button"
diff --git a/src/components/settings/Settings.svelte b/src/components/settings/Settings.svelte
index 5520b88a..4e9d9142 100644
--- a/src/components/settings/Settings.svelte
+++ b/src/components/settings/Settings.svelte
@@ -66,7 +66,7 @@
   <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
     <span class="text-3xl font-bold">{$_("settings")}</span>
     <div>
-      <div class="md:grid md:grid-cols-3 md:gap-6">
+      <div class="md:grid md:grid-cols-3 md:gap-2 lg:gap-6">
         <div class="md:col-span-1">
           <div class="sm:px-0">
             <h3 class="text-lg font-medium leading-6 text-gray-900">
@@ -174,7 +174,7 @@
   </div>
   <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
     <div>
-      <div class="md:grid md:grid-cols-3 md:gap-6">
+      <div class="md:grid md:grid-cols-3 md:gap-2 lg:gap-6">
         <div class="md:col-span-1">
           <div class="sm:px-0">
             <h3 class="text-lg font-medium leading-6 text-gray-900">
@@ -245,7 +245,7 @@
   </div>
   <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
     <div>
-      <div class="md:grid md:grid-cols-3 md:gap-6">
+      <div class="md:grid md:grid-cols-3 md:gap-2 lg:gap-6">
         <div class="md:col-span-1">
           <div class="sm:px-0">
             <h3 class="text-lg font-medium leading-6 text-gray-900">
diff --git a/src/components/statsclients/AddStatsClientModal.svelte b/src/components/statsclients/AddStatsClientModal.svelte
index 7242d424..cefb9e86 100644
--- a/src/components/statsclients/AddStatsClientModal.svelte
+++ b/src/components/statsclients/AddStatsClientModal.svelte
@@ -86,7 +86,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -101,18 +101,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-statsclient")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-create-a-new-statsclient"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="description"
@@ -133,7 +133,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/statsclients/ConfirmStatsClientDeletion.svelte b/src/components/statsclients/ConfirmStatsClientDeletion.svelte
index d6a243fe..efe44f3a 100644
--- a/src/components/statsclients/ConfirmStatsClientDeletion.svelte
+++ b/src/components/statsclients/ConfirmStatsClientDeletion.svelte
@@ -49,7 +49,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -61,11 +61,11 @@
                 /></svg
               >
             </div>
-            <!-- <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <!-- <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_('attention')}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     'do-you-want-to-delete-this-donor-with-all-related-donations'
@@ -77,7 +77,7 @@
             </div> -->
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={deleteClient}
             type="button"
diff --git a/src/components/statsclients/CopyStatsClientTokenModal.svelte b/src/components/statsclients/CopyStatsClientTokenModal.svelte
index 93491e0f..4d64c385 100644
--- a/src/components/statsclients/CopyStatsClientTokenModal.svelte
+++ b/src/components/statsclients/CopyStatsClientTokenModal.svelte
@@ -60,7 +60,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -73,11 +73,11 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("token")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "the-statsclient-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again"
@@ -86,7 +86,7 @@
                   {$_("please-copy-the-token-and-store-it-somewhere-save")}
                 </p>
               </div>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <label
                   for="token"
                   class="block text-sm font-medium text-gray-700"
@@ -123,7 +123,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             on:click={close}
             type="button"
diff --git a/src/components/teams/AddTeamModal.svelte b/src/components/teams/AddTeamModal.svelte
index 2aa1375a..202541bb 100644
--- a/src/components/teams/AddTeamModal.svelte
+++ b/src/components/teams/AddTeamModal.svelte
@@ -97,7 +97,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -112,18 +112,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left">
+            <div class="mt-3">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-team")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-team"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -184,7 +184,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/teams/ConfirmTeamDeletionModal.svelte b/src/components/teams/ConfirmTeamDeletionModal.svelte
index 84caf2c7..fce2a9b6 100644
--- a/src/components/teams/ConfirmTeamDeletionModal.svelte
+++ b/src/components/teams/ConfirmTeamDeletionModal.svelte
@@ -52,7 +52,7 @@
 				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
 					<div class="">
 						<div
-							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
 						>
 							<svg
 								class="h-6 w-6 text-blue-600"
@@ -67,13 +67,13 @@
 								/></svg
 							>
 						</div>
-						<div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
 							<h3 class="text-lg leading-6 font-medium text-gray-900">
 								{$_("do-you-want-to-delete-the-team-delete_team-name", {
 									values: { teamname: delete_team.name },
 								})}
 							</h3>
-							<div class="mt-2 mb-6">
+							<div class="mb-6">
 								<p class="text-sm text-gray-500">
 									{$_("all-associated-runners-will-be-deleted-too")}
 								</p>
@@ -81,7 +81,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
 					<button
 						on:click={deleteTeam}
 						type="button"
diff --git a/src/components/tracks/AddTrackModal.svelte b/src/components/tracks/AddTrackModal.svelte
index af7a0921..4355a93f 100644
--- a/src/components/tracks/AddTrackModal.svelte
+++ b/src/components/tracks/AddTrackModal.svelte
@@ -95,7 +95,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -110,18 +110,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-track")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-track"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="trackname"
@@ -215,7 +215,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
diff --git a/src/components/users/AddUserModal.svelte b/src/components/users/AddUserModal.svelte
index 94d6c482..57f53ea5 100644
--- a/src/components/users/AddUserModal.svelte
+++ b/src/components/users/AddUserModal.svelte
@@ -112,7 +112,7 @@
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
           <div class="">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
             >
               <svg
                 class="h-6 w-6 text-blue-600"
@@ -127,18 +127,18 @@
                 /></svg
               >
             </div>
-            <div class="mt-3 text-center sm:text-left">
+            <div class="mt-3">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 {$_("create-a-new-user")}
               </h3>
-              <div class="mt-2 mb-6">
+              <div class="mb-6">
                 <p class="text-sm text-gray-500">
                   {$_(
                     "please-provide-the-required-information-to-add-a-new-user"
                   )}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-6 text-left">
+              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
                 <div class="col-span-6">
                   <label
                     for="firstname"
@@ -272,7 +272,7 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 grid gap-2 lg:rounded-b-xl">
+        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}