diff --git a/src/Main.vue b/src/Main.vue
index 33daea3..163dff5 100644
--- a/src/Main.vue
+++ b/src/Main.vue
@@ -4,6 +4,9 @@
   </div>
 </template>
 
+
+
+
 <style>
 
 html {
diff --git a/src/components/ElectronJS/FrameButtons.vue b/src/components/ElectronJS/FrameButtons.vue
index 4eda991..432b24e 100644
--- a/src/components/ElectronJS/FrameButtons.vue
+++ b/src/components/ElectronJS/FrameButtons.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="frame-buttons">
     <div
-      class="minimize"
+      class="button minimize"
       @click="minimizeWindow()"
     >
       <i class="material-icons">minimize</i>
     </div>
     <div
-      class="res-max"
+      class="button res-max"
       @click="maximizeWindow()"
     >
       <i class="material-icons">check_box_outline_blank</i>
     </div>
     <div
-      class="close"
+      class="button close"
       @click="closeWindow()"
     >
       <i class="material-icons">close</i>
@@ -48,9 +48,19 @@ export default {
 <style scoped>
 .frame-buttons {
   display: flex;
-  align-items: center;
-  -webkit-app-region: drag;
   user-select: none;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 9999999999999999;
+  height: 30px;
+  -webkit-app-region: drag;
+  justify-content: flex-end;
+}
+.button {
+  -webkit-app-region: no-drag;
+  
 }
 .frame-buttons div {
   display: flex;
diff --git a/src/components/app/Popouts/Popouts/Settings.vue b/src/components/app/Popouts/Popouts/Settings.vue
index adc9811..e2d89fd 100644
--- a/src/components/app/Popouts/Popouts/Settings.vue
+++ b/src/components/app/Popouts/Popouts/Settings.vue
@@ -46,6 +46,7 @@ export default {
   },
   data() {
     return {
+      isElectron: window && window.process && window.process.type,
       currentTab: 0,
       tabs: [
         {
@@ -78,7 +79,7 @@ export default {
   methods: {
     logout() {
       this.$store.dispatch("logout");
-      window.location.href = "/";
+      this.isElectron ? window.location.href = '/login' : window.location.href = "/";
     },
     close() {
       this.$store.dispatch("setPopoutVisibility", {
diff --git a/src/utils/changelog.js b/src/utils/changelog.js
index da9024c..5013ac8 100644
--- a/src/utils/changelog.js
+++ b/src/utils/changelog.js
@@ -14,6 +14,18 @@
 
 const config = [
 
+  {
+    version: 6.0,
+    title: "Desktop app!",
+    shortTitle: "",
+    date: "11/08/2019",
+    headColor: "rgba(255, 80, 17, 0.77)",
+    new: [
+      "Desktop app is available to download!"
+    ],
+    msg: 'Download: https://github.com/supertiger1234/nertivia-desktop-app/releases'
+  },
+
   {
     version: 5.9,
     title: "More Bug fixes!",
diff --git a/src/views/App.vue b/src/views/App.vue
index d312a0c..cfb693e 100644
--- a/src/views/App.vue
+++ b/src/views/App.vue
@@ -30,8 +30,10 @@
               Ad
             </div> -->
           </div>
-          <div class="drag-area" v-if="isElectron"></div>
-          <electron-frame-buttons v-if="isElectron"/>
+            <div class="window-buttons" v-if="isElectron">
+              <electron-frame-buttons />
+            </div>
+
         </div>
         <div class="panel-layout">
           <news v-if="currentTab == 0"/>
@@ -60,11 +62,9 @@ import Spinner from "./../components/Spinner.vue";
 
 
 const ElectronFrameButtons = () =>
-  import("./../components/ElectronJS/FrameButtons.vue");
-
+  import("@/components/ElectronJS/FrameButtons.vue");
 const News = () =>
   import(/* webpackChunkName: "News" */ "./../components/app/Tabs/News.vue");
-//const DirectMessage = () => import('./../components/app/Tabs/DirectMessage.vue');
 const DirectMessage = () => ({
   component: import("./../components/app/Tabs/DirectMessage.vue"),
   loading: Spinner,
@@ -79,12 +79,13 @@ const Servers = () => ({
 export default {
   name: "app",
   components: {
-    ElectronFrameButtons,
+
     DirectMessage,
     Servers,
     ConnectingScreen,
     Popouts,
-    News
+    News,
+    ElectronFrameButtons
   },
   data() {
     return {
@@ -267,21 +268,19 @@ export default {
   flex-shrink: 0;
 }
 
-.drag-area {
-  display: flex;
-  min-width: 20px;
+.window-buttons {
+  position: relative;
+  min-width: 175px;
   flex: 1;
-  -webkit-app-region: drag;
 }
 
 .tabs {
   display: flex;
   overflow-y: hidden;
   overflow-x: auto;
-  max-width: 560px;
+  max-width: 500px;
   flex-basis: auto; /* default value */
   flex-grow: 1;
-  -webkit-app-region: no-drag;
 }
 
 .tabs::-webkit-scrollbar {
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 90df8fd..0969294 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -1,5 +1,6 @@
 <template>
   <div id="app">
+    <electron-frame-buttons v-if="isElectron" />
     <div class="app-content">
       <header-login @isDay="isDayEvent" />
       <div class="content">
@@ -111,10 +112,16 @@ import Recaptcha from "@/components/Recaptcha.vue";
 import HeaderLogin from "@/components/HeaderLoginTemplate.vue";
 import AuthenticationService from "@/services/AuthenticationService";
 import particlesJS from "@/components/ParticlesJS.vue";
+
+const ElectronFrameButtons = () =>
+  import("@/components/ElectronJS/FrameButtons.vue");
+
 export default {
-  components: { HeaderLogin, Recaptcha, particlesJS },
+  components: { HeaderLogin, Recaptcha, particlesJS, ElectronFrameButtons },
   data() {
     return {
+      isElectron: window && window.process && window.process.type,
+
       showCaptcha: false,
       visible: true,
       email: { value: "", alert: "" },
@@ -248,11 +255,9 @@ html, body {
   display: flex;
   position: relative;
   flex-direction: column;
-  height: 100%;
   width: 100%;
   overflow: auto;
   z-index: 9999;
-  padding-bottom: 100px;
 }
 .background {
   position: fixed;
diff --git a/src/views/RegisterPage.vue b/src/views/RegisterPage.vue
index 3f95616..5f13fcc 100644
--- a/src/views/RegisterPage.vue
+++ b/src/views/RegisterPage.vue
@@ -1,5 +1,6 @@
 <template>
   <div id="app">
+    <electron-frame-buttons v-if="isElectron" />
     <div class="app-content">
       <header-login @isDay="isDayEvent" />
       <div class="content">
@@ -124,10 +125,16 @@ import Recaptcha from "@/components/Recaptcha.vue";
 import HeaderLogin from "@/components/HeaderLoginTemplate.vue";
 import AuthenticationService from "@/services/AuthenticationService";
 import particlesJS from "@/components/ParticlesJS.vue";
+
+const ElectronFrameButtons = () =>
+  import("@/components/ElectronJS/FrameButtons.vue");
+
 export default {
-  components: { HeaderLogin, Recaptcha, particlesJS },
+  components: { HeaderLogin, Recaptcha, particlesJS, ElectronFrameButtons },
   data() {
     return {
+      isElectron: window && window.process && window.process.type,
+
       showCaptcha: false,
       visible: true,
       email: { value: "", alert: "" },
@@ -254,11 +261,9 @@ html, body {
   display: flex;
   position: relative;
   flex-direction: column;
-  height: 100%;
   width: 100%;
   overflow: auto;
   z-index: 9999;
-  padding-bottom: 100px;
 }
 .background {
   position: fixed;