diff --git a/ui/src/App.vue b/ui/src/App.vue
index 3bcc598..cbf2889 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -8,13 +8,17 @@
       />
       <Dashboard>
         <template slot="message">
-          <ImageCarousel
-            :speed="image_speed"
-            :height="image_height"
-            :contain="image_contain"
-            :urls="image_urls"
-          />
-          <Message :html="message_html" />
+          <div class="d-flex flex-column fill-height pb-12">
+            <Message :html="message_html" />
+            <ImageCarousel
+              class="mt-auto"
+              v-if="image_urls.length > 0"
+              :speed="image_speed"
+              :height="image_height"
+              :contain="image_contain"
+              :urls="image_urls"
+            />
+          </div>
         </template>
         <template slot="calendars">
           <CalendarCarousel :speed="calendar_speed" :data="calendar_data" />
diff --git a/ui/src/components/Dashboard.vue b/ui/src/components/Dashboard.vue
index 951a2ba..c6b4f87 100644
--- a/ui/src/components/Dashboard.vue
+++ b/ui/src/components/Dashboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fill-height>
+  <v-container fill-height class="pa-0">
     <v-layout>
       <v-col cols="4">
         <slot name="message">MESSAGE</slot>