diff --git a/src/components/modals/Modal.vue b/src/components/modals/Modal.vue
index fde2c3f..fb4f635 100644
--- a/src/components/modals/Modal.vue
+++ b/src/components/modals/Modal.vue
@@ -3,25 +3,24 @@
     <div class="modal-backdrop" @click="close">
       <div
         class="modal"
-        v-bind:class="[isMaximized ? 'maximized' : 'not-maximized']"
+        :class="{ maximized: isMaximized }"
         role="dialog"
         aria-labelledby="modalTitle"
         aria-describedby="modalDescription"
         @click.stop=""
       >
-        <font-awesome-icon
-          @click="isMaximized = !isMaximized"
-          class="maximize-toggle"
-          v-if="isMaximized"
-          icon="window-minimize"
-        />
-        <font-awesome-icon
-          @click="isMaximized = !isMaximized"
-          class="maximize-toggle"
-          v-if="!isMaximized"
-          icon="window-maximize"
-        />
-        <font-awesome-icon @click="close" class="close" icon="times-circle" />
+        <div class="top-right-buttons">
+          <font-awesome-icon
+            @click="isMaximized = !isMaximized"
+            class="top-right-button"
+            :icon="['fas', isMaximized ? 'window-minimize' : 'window-maximize']"
+          />
+          <font-awesome-icon
+            @click="close"
+            class="top-right-button"
+            icon="times-circle"
+          />
+        </div>
         <slot></slot>
       </div>
     </div>
@@ -64,7 +63,8 @@ export default {
   box-shadow: 2px 2px 20px 1px #000;
   display: flex;
   flex-direction: column;
-  max-width: 60%;
+  max-height: 80%;
+  max-width: 80%;
 
   .vote-history &,
   .night-reference &,
@@ -83,33 +83,21 @@ export default {
     justify-content: center;
     line-height: 100%;
   }
-  > .close {
+  > .top-right-buttons {
     position: absolute;
-    right: 20px;
-    top: 20px;
-    cursor: pointer;
-    z-index: 5;
-    &:hover {
-      color: red;
-    }
-  }
-  > .maximize-toggle {
     z-index: 100;
-    position: absolute;
-    right: 52px;
     top: 20px;
-    cursor: pointer;
-    &:hover {
-      color: red;
+    right: 20px;
+    > .top-right-button {
+      cursor: pointer;
+      width: 28px;
+      &:hover {
+        color: red;
+      }
     }
   }
 }
 
-.not-maximized {
-  max-height: 80%;
-  max-width: 80%;
-}
-
 .maximized {
   background: rgba(0, 0, 0, 0.95);
   padding: 0;
@@ -119,7 +107,6 @@ export default {
   max-height: 100%;
   display: flex;
   align-content: center;
-  align-items: center;
   justify-content: safe center;
 }
 
diff --git a/src/components/modals/NightOrderModal.vue b/src/components/modals/NightOrderModal.vue
index 56ca3e2..a572cfa 100644
--- a/src/components/modals/NightOrderModal.vue
+++ b/src/components/modals/NightOrderModal.vue
@@ -2,7 +2,7 @@
   <Modal
     class="night-reference"
     @close="toggleModal('nightOrder')"
-    v-show="modals.nightOrder && roles.size"
+    v-if="modals.nightOrder && roles.size"
   >
     <font-awesome-icon
       @click="toggleModal('reference')"
diff --git a/src/components/modals/ReferenceModal.vue b/src/components/modals/ReferenceModal.vue
index 25a9c3a..393dd42 100644
--- a/src/components/modals/ReferenceModal.vue
+++ b/src/components/modals/ReferenceModal.vue
@@ -2,7 +2,7 @@
   <Modal
     class="characters"
     @close="toggleModal('reference')"
-    v-show="modals.reference && roles.size"
+    v-if="modals.reference && roles.size"
   >
     <font-awesome-icon
       @click="toggleModal('nightOrder')"
diff --git a/src/components/modals/VoteHistoryModal.vue b/src/components/modals/VoteHistoryModal.vue
index d797ddc..bf6331a 100644
--- a/src/components/modals/VoteHistoryModal.vue
+++ b/src/components/modals/VoteHistoryModal.vue
@@ -1,7 +1,7 @@
 <template>
   <Modal
     class="vote-history"
-    v-show="modals.voteHistory && session.voteHistory"
+    v-if="modals.voteHistory && session.voteHistory"
     @close="toggleModal('voteHistory')"
   >
     <font-awesome-icon