diff --git a/src/components/app/ConnectingScreen.vue b/src/components/app/ConnectingScreen.vue
index b974f3c..9e5456e 100644
--- a/src/components/app/ConnectingScreen.vue
+++ b/src/components/app/ConnectingScreen.vue
@@ -95,6 +95,9 @@ export default {
 .center-box {
   display: flex;
   flex-direction: column;
+  align-items: center;
+  align-content: center;
+  justify-content: center;
 }
 .message {
   text-align: center;
diff --git a/src/components/app/messageEmbedTemplate.vue b/src/components/app/messageEmbedTemplate.vue
index 86d5739..44f43eb 100644
--- a/src/components/app/messageEmbedTemplate.vue
+++ b/src/components/app/messageEmbedTemplate.vue
@@ -9,7 +9,11 @@
   >
     <div class="right">
       <div class="image" v-if="imageURL" @click="embedImgClicked">
-        <img ref="image" :src="`//images.weserv.nl/?url=${imageURL}`" alt />
+        <img
+          ref="image"
+          :src="`//proxi.bree.workers.dev/cdn/${encodeURIComponent(imageURL)}`"
+          alt
+        />
       </div>
     </div>
     <div class="left">
@@ -31,7 +35,7 @@ export default {
     embedImgClicked() {
       this.$store.dispatch(
         "setImagePreviewURL",
-        "//images.weserv.nl/?url=" + this.imageURL
+        `//proxi.bree.workers.dev/cdn/${encodeURIComponent(this.imageURL)}`
       );
     },
     clamp(num, min, max) {
diff --git a/src/views/App.vue b/src/views/App.vue
index b22c4c0..16c724c 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -2,9 +2,9 @@
   <div id="app" ref="app" :class="{ desktop: isElectron }">
     <vue-headful :title="title" description="Nertivia Chat Client" />
     <div class="background-color"></div>
-    <transition name="fade-between-two" appear mode="in-out">
-      <ConnectingScreen v-if="!ready" />
-      <div class="box" v-if="loggedIn">
+    <transition-group name="fade-between-two" appear mode="in-out">
+      <ConnectingScreen key="connect-screen" v-if="!ready" />
+      <div class="box" key="content" v-if="loggedIn">
         <div class="frame" v-if="isElectron">
           <div class="window-buttons">
             <electron-frame-buttons />
@@ -21,7 +21,7 @@
           <admin-panel v-if="currentTab == 4" />
         </div>
       </div>
-    </transition>
+    </transition-group>
     <Popouts v-if="loggedIn" />
   </div>
 </template>