diff --git a/src/components/Global/Modal/BasicModal.vue b/src/components/Global/Modal/BasicModal.vue
index 6c145e3..60ab649 100644
--- a/src/components/Global/Modal/BasicModal.vue
+++ b/src/components/Global/Modal/BasicModal.vue
@@ -7,11 +7,7 @@
     dark
   >
     <main-back height="100%" :is-modal="true">
-      <component
-        :is="tag"
-        @submit="$emit('submit')"
-        :ref="tag == 'form' ? 'form' : null"
-      >
+      <component :is="tag" @submit="$emit('submit')" :ref="tag == 'form' ? 'form' : null">
         <v-card class="wa__modal">
           <div class="wa__modal-header">
             <slot name="header" :modal="modal" :data="data" v-if="modal"></slot>
@@ -19,9 +15,9 @@
           <v-card-text class="wa__modal-content pb-0">
             <slot :modal="modal" :data="data" v-if="modal"></slot>
           </v-card-text>
-          <template v-if="!notFooter">
+          <div v-if="hasFooter" class="px-4">
             <v-divider class="mb-0"></v-divider>
-          </template>
+          </div>
           <v-card-actions class="wa__modal-footer px-0">
             <slot name="footer" :modal="modal" :data="data" v-if="modal"></slot>
           </v-card-actions>
@@ -39,8 +35,8 @@ export default {
     maxWidth: { default: null },
     name: { default: null },
     transition: { default: "slide-x-transition" },
-    notFooter: {
-      default: false,
+    hasFooter: {
+      default: true,
     },
     tag: {
       default: "div",
diff --git a/src/components/ProgramSeries/Modals/AddSeriesModal.vue b/src/components/ProgramSeries/Modals/AddSeriesModal.vue
index 7313253..0ee37ee 100644
--- a/src/components/ProgramSeries/Modals/AddSeriesModal.vue
+++ b/src/components/ProgramSeries/Modals/AddSeriesModal.vue
@@ -61,8 +61,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100 pb-10">
+      <div class="d-flex justify-space-between align-items-center w-100 pb-10 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
diff --git a/src/components/Programs/Modals/Detail.vue b/src/components/Programs/Modals/Detail.vue
index 5d14dc8..9ce77e2 100644
--- a/src/components/Programs/Modals/Detail.vue
+++ b/src/components/Programs/Modals/Detail.vue
@@ -69,12 +69,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
-        height="29"
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
-        text="close"
-        @click="$_closeModal()"
-      />
+      <div class="px-4">
+        <RectangleButton
+          height="29"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
+          text="close"
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>
diff --git a/src/components/Programs/Modals/FiltersModal.vue b/src/components/Programs/Modals/FiltersModal.vue
index aebfefd..e175278 100644
--- a/src/components/Programs/Modals/FiltersModal.vue
+++ b/src/components/Programs/Modals/FiltersModal.vue
@@ -70,8 +70,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100">
+    <div class="d-flex justify-space-between align-items-center w-100 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue
index 8fdd105..0d8360a 100644
--- a/src/components/Users/Modals/ChangeRoleModal.vue
+++ b/src/components/Users/Modals/ChangeRoleModal.vue
@@ -29,8 +29,7 @@
       </v-item-group>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100">
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"
diff --git a/src/components/Users/Modals/Detail.vue b/src/components/Users/Modals/Detail.vue
index 809c2ed..6ac5af5 100644
--- a/src/components/Users/Modals/Detail.vue
+++ b/src/components/Users/Modals/Detail.vue
@@ -61,12 +61,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
-        height="29"
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
-        text="close"
-        @click="$_closeModal()"
-      />
+      <div class="px-4">
+        <RectangleButton
+          height="29"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
+          text="close"
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>
diff --git a/src/components/Users/Modals/FiltersModal.vue b/src/components/Users/Modals/FiltersModal.vue
index 61a1790..5fba999 100644
--- a/src/components/Users/Modals/FiltersModal.vue
+++ b/src/components/Users/Modals/FiltersModal.vue
@@ -62,8 +62,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100">
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"
diff --git a/src/components/Workouts/Modals/Detail.vue b/src/components/Workouts/Modals/Detail.vue
index b615d0f..8348c65 100644
--- a/src/components/Workouts/Modals/Detail.vue
+++ b/src/components/Workouts/Modals/Detail.vue
@@ -83,12 +83,14 @@
     </template>
     <template #footer>
       <v-spacer></v-spacer>
-      <RectangleButton
-        height="29"
-        class="btn__modal--confirm custom-btn wa__f__m__eb"
-        text="close"
-        @click="$_closeModal()"
-      />
+      <div class="px-4">
+        <RectangleButton
+          height="29"
+          class="btn__modal--confirm custom-btn wa__f__m__eb"
+          text="close"
+          @click="$_closeModal()"
+        />
+      </div>
     </template>
   </basic-modal>
 </template>
diff --git a/src/components/Workouts/Modals/FiltersModal.vue b/src/components/Workouts/Modals/FiltersModal.vue
index 3b33884..29d1139 100644
--- a/src/components/Workouts/Modals/FiltersModal.vue
+++ b/src/components/Workouts/Modals/FiltersModal.vue
@@ -49,8 +49,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100">
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="clear"
diff --git a/src/components/WorkoutsSeries/Modals/AttachWorkoutModal.vue b/src/components/WorkoutsSeries/Modals/AttachWorkoutModal.vue
index b887c13..f6af937 100644
--- a/src/components/WorkoutsSeries/Modals/AttachWorkoutModal.vue
+++ b/src/components/WorkoutsSeries/Modals/AttachWorkoutModal.vue
@@ -103,8 +103,7 @@
       </div>
     </template>
     <template #footer>
-      <v-spacer></v-spacer>
-      <div class="d-flex justify-space-between align-items-center w-100">
+      <div class="d-flex justify-space-between align-items-center w-100 px-4">
         <RectangleButton
           class="btn__modal--cancel pl-0"
           text="cancel"