diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 32d70f1..dc6649b 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -48,46 +48,48 @@
             alternate_email
           </div>
         </div>
-        <SimpleMarkdown
-          class="content-message"
-          :style="[
-            message.color && message.color !== -2
-              ? { color: message.color }
-              : ''
-          ]"
-          :message="message.message"
-        />
-        <div
-          class="file-content"
-          v-if="getFile && !getFile.fileName.endsWith('.mp3')"
-        >
-          <div class="icon">
-            <i class="material-icons">insert_drive_file</i>
+        <div class="inner-content">
+          <SimpleMarkdown
+            class="content-message"
+            :style="[
+              message.color && message.color !== -2
+                ? { color: message.color }
+                : ''
+            ]"
+            :message="message.message"
+          />
+          <div
+            class="file-content"
+            v-if="getFile && !getFile.fileName.endsWith('.mp3')"
+          >
+            <div class="icon">
+              <i class="material-icons">insert_drive_file</i>
+            </div>
+            <div class="information">
+              <div class="info">{{ getFile.fileName }}</div>
+              <a :href="getFile.url" download target="_blank">
+                <div class="download-button">Download</div>
+              </a>
+            </div>
           </div>
-          <div class="information">
+          <div
+            v-if="getFile && getFile.fileName.endsWith('.mp3')"
+            class="file-content music"
+          >
             <div class="info">{{ getFile.fileName }}</div>
-            <a :href="getFile.url" download target="_blank">
-              <div class="download-button">Download</div>
-            </a>
+            <audio controls>
+              <source :src="getFile.url" type="audio/mp3" />
+            </audio>
           </div>
-        </div>
-        <div
-          v-if="getFile && getFile.fileName.endsWith('.mp3')"
-          class="file-content music"
-        >
-          <div class="info">{{ getFile.fileName }}</div>
-          <audio controls>
-            <source :src="getFile.url" type="audio/mp3" />
-          </audio>
-        </div>
 
-        <div class="image-content" ref="image" v-if="getImage">
-          <img :src="getImage" @click="imageClicked" />
+          <div class="image-content" ref="image" v-if="getImage">
+            <img :src="getImage" @click="imageClicked" />
+          </div>
+          <message-embed-template
+            v-if="message.embed && Object.keys(message.embed).length"
+            :embed="message.embed"
+          />
         </div>
-        <message-embed-template
-          v-if="message.embed && Object.keys(message.embed).length"
-          :embed="message.embed"
-        />
       </div>
       <div class="other-information">
         <div
@@ -392,7 +394,7 @@ $message-color: rgba(0, 0, 0, 0.3);
     margin-left: 0;
   }
   .user-info {
-    align-items: center;
+    margin-top: 2px;
   }
   .avatar {
     height: 15px;
@@ -563,6 +565,11 @@ $message-color: rgba(0, 0, 0, 0.3);
   border-radius: 4px;
   border-bottom-left-radius: 0;
 }
+.inner-content {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+}
 .ownMessageRight .content {
   border-radius: 4px;
   border-bottom-right-radius: 0;
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index 192a4b1..e0bb096 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -6,6 +6,9 @@ const config = [
     date: "15/02/2020",
     new: [
       "Messages by the same user should now be grouped. This will make it easier to read messages and save some screen space."
+    ],
+    fix: [
+      "Fixed a bug where message role colors would make the messages load slower."
     ]
   },
   {