diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index a7bd698..853cdfc 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -1,106 +1,108 @@
-<script>
-import { useSessionStore } from '@/stores/sessionStore.js'
-import router from '@/router/router.js'
-
-export default {
-  name: 'Navbar',
-  data(){
-    return{
-      sessionStore: useSessionStore()
-    }
-  },
-  methods: {
-    exit(){
-      this.sessionStore.user.isConnected = false
-      router.push('/');
-    }
-  }
-}
-
-</script>
-
-<template>
-
-  <nav>
-    <ul v-if="!this.sessionStore.user.isConnected" class="navbar">
-      <li>
-        <router-link to="/login" class="navbar__link">Login</router-link>
-      </li>
-      <li>
-        <router-link to="/play" class="navbar__link">Play</router-link>
-      </li>
-      <li>
-        <router-link to="/about" class="navbar__link">About</router-link>
-      </li>
-    </ul>
-
-
-    <ul v-if="this.sessionStore.user.isConnected" class="navbar navbar--mod">
-      <li>
-        <router-link to="/games" class="navbar__link navbar__link--mod">Games</router-link>
-      </li>
-      <li>
-        <router-link to="/create" class="navbar__link navbar__link--mod" >Create</router-link>
-      </li>
-
-      <li class="navbar__submenu">
-        <router-link to="/profile" class="navbar__link navbar__link--mod" >Comunnity</router-link>
-      </li>
-      <li>
-        <a @click="exit" class="navbar__link pointer navbar__link pointer--mod" >Exit</a>
-      </li>
-    </ul>
-  </nav>
-
-  <!--For mobile-->
-  <nav class= "hambmenu" v-if="!this.sessionStore.isConnected">
-      <article class="hambmenu__icon">
-        <input aria-label="drop menu on mobiles" type="checkbox" class="hambmenu__check">
-          <label for="hambmenu__check">
-            <img src="../../public/hambmenu.svg"
-                 alt="Menu icon"
-                  class="hambmenu__img">
-          </label>
-
-        <ul class="hambmenu__submenu" v-if="!sessionStore.user.isConnected">
-          <li>
-            <router-link to="/" aria-current="page"  class="navbar__link">Home</router-link>
-          </li>
-          <li>
-            <router-link to="/play" class="navbar__link">Play</router-link>
-          </li>
-          <li>
-            <router-link to="/about" class="navbar__link">About</router-link>
-          </li>
-        </ul>
-      </article>
-
-  </nav>
-
-  <nav class= "hambmenu hambmenu--mod" v-if="this.sessionStore.user.isConnected">
-      <article class="hambmenu__icon hambmenu__icon--mod">
-         <input aria-label="drop menu on mobiles" type="checkbox" class="hambmenu__check">
-        <label for="hambmenu__check">
-          <img src="../../public/hambmenu.svg"
-               alt="Menu icon"
-               class="hambmenu__img">
-        </label>
-        <ul class="hambmenu__submenu hambmenu__submenu--mod">
-          <li>
-            <router-link to="/games" class="navbar__link">Games</router-link>
-          </li>
-          <li>
-            <router-link to="/create" class="navbar__link" >Create</router-link>
-          </li>
-          <li class="navbar__submenu">
-            <router-link to="/profile" class="navbar__link">Comunnity</router-link>
-          </li>
-          <li>
-            <a @click="exit" class="navbar__link pointer" >Exit</a>
-          </li>
-        </ul>
-      </article>
-
-  </nav>
-
-</template>
+<script>
+import { useSessionStore } from '@/stores/sessionStore.js'
+import router from '@/router/router.js'
+
+export default {
+  name: 'Navbar',
+  data(){
+    return{
+      sessionStore: useSessionStore()
+    }
+  },
+  methods: {
+    exit(){
+      this.sessionStore.user.isConnected = false
+      router.push('/');
+    }
+  }
+}
+
+</script>
+
+<template>
+
+  <!--DESKTOP-->
+  <!--no connected-->
+  <nav>
+    <ul v-if="!this.sessionStore.user.isConnected" class="navbar">
+      <li>
+        <router-link to="/play" class="navbar__link">Play</router-link>
+      </li>
+      <li>
+        <router-link to="/profile" class="navbar__link">Community</router-link>
+      </li>
+      <li>
+        <router-link to="/about" class="navbar__link">About</router-link>
+      </li>
+    </ul>
+    <!--connected-->
+    <ul v-if="this.sessionStore.user.isConnected" class="navbar navbar--mod">
+      <li>
+        <router-link to="/play" class="navbar__link navbar__link--mod">Play</router-link>
+      </li>
+      <li>
+        <router-link to="/create" class="navbar__link navbar__link--mod" >Create</router-link>
+      </li>
+      <li class="navbar__submenu">
+        <router-link to="/profile" class="navbar__link navbar__link--mod" >Comunnity</router-link>
+      </li>
+      <li>
+        <a @click="exit" class="navbar__link pointer navbar__link pointer--mod" >Exit</a>
+      </li>
+    </ul>
+  </nav>
+
+  <!--TABLET/MOBILE-->
+  <!--no connected-->
+  <nav class= "hambmenu" v-if="!this.sessionStore.isConnected">
+      <article class="hambmenu__icon">
+        <input aria-label="drop menu on mobiles" type="checkbox" class="hambmenu__check">
+          <label for="hambmenu__check">
+            <img src="../../public/hambmenu.svg"
+                 alt="Menu icon"
+                  class="hambmenu__img">
+          </label>
+
+        <ul class="hambmenu__submenu" v-if="!sessionStore.user.isConnected">
+          <li>
+            <router-link to="/play" class="navbar__link">Play</router-link>
+          </li>
+          <li>
+            <router-link to="/profile" class="navbar__link">Community</router-link>
+          </li>
+          <li>
+            <router-link to="/about" class="navbar__link">About</router-link>
+          </li>
+        </ul>
+      </article>
+
+  </nav>
+
+  <!--connected-->
+  <nav class= "hambmenu hambmenu--mod" v-if="this.sessionStore.user.isConnected">
+      <article class="hambmenu__icon hambmenu__icon--mod">
+         <input aria-label="drop menu on mobiles" type="checkbox" class="hambmenu__check">
+        <label for="hambmenu__check">
+          <img src="../../public/hambmenu.svg"
+               alt="Menu icon"
+               class="hambmenu__img">
+        </label>
+        <ul class="hambmenu__submenu hambmenu__submenu--mod">
+          <li>
+            <router-link to="/play" class="navbar__link">Play</router-link>
+          </li>
+          <li>
+            <router-link to="/create" class="navbar__link" >Create</router-link>
+          </li>
+          <li class="navbar__submenu">
+            <router-link to="/profile" class="navbar__link">Comunnity</router-link>
+          </li>
+          <li>
+            <a @click="exit" class="navbar__link pointer" >Exit</a>
+          </li>
+        </ul>
+      </article>
+
+  </nav>
+
+</template>
diff --git a/src/components/Quiz.vue b/src/components/Quiz.vue
index d802766..6429f43 100644
--- a/src/components/Quiz.vue
+++ b/src/components/Quiz.vue
@@ -262,13 +262,13 @@ export default {
       :
     await this.getQuestionsFromAPIForNewQuiz()
 
-    this.mode.gameMode !== "zen" &&  await this.createQuizAndMatchOnDB()
+    useSessionStore().user.isConnected && this.mode.gameMode !== "zen" &&  await this.createQuizAndMatchOnDB()
   },
 
   watch: {
     counter(value) {
       // when matches finish and game mode is not zen
-      if (value>this.questions.length-1 && this.mode.gameMode !== "zen") this.handleFinishedQuiz()
+      if (useSessionStore().user.isConnected && value>this.questions.length-1 && this.mode.gameMode !== "zen") this.handleFinishedQuiz()
     },
   }
 
@@ -277,11 +277,7 @@ export default {
 
 <template>
 
-  <Loading v-if="!questions.length"
-           key-word="loading"
-           imgSrc="/public/electron.svg"
-  ></Loading>
-
+  <Loading v-if="!questions.length" key-word="loading" imgSrc="/public/electron.svg"></Loading>
   <section class="quiz quiz--home"
            v-if="questions.length > 0
                  && questions[counter]
@@ -330,6 +326,7 @@ export default {
           <span class="quiz__response">{{questions[counter].option_c}}</span>
         </label>
       </fieldset>
+      <!--img for right/fail-->
       <img src="../../public/like.svg"
            class="quiz__like"
            :class="{'active' : isCorrectAnimationTrigger}"
diff --git a/src/pages/Games.vue b/src/pages/Games.vue
index 49bd8cb..2cc6d06 100644
--- a/src/pages/Games.vue
+++ b/src/pages/Games.vue
@@ -1,71 +1,71 @@
-<script>
-
-import BigButtonsMenu from '@/components/BigButtonsMenu.vue'
-import router from '@/router/router.js'
-import { useSessionStore } from '@/stores/sessionStore.js'
-import { v4 as uuidv4 } from 'uuid';
-
-export default {
-  name: 'Games',
-  components: { BigButtonsMenu },
-  data(){
-    return{
-      roomID: null
-    }
-  },
-
-  methods: {
-    router() {
-      return router
-    },
-    generateRoomID(){
-      useSessionStore().user.createdRoomID = uuidv4().split('-')[4]
-      useSessionStore().user.roomAdmin = true
-      this.router().push('/room')
-    },
-
-    joinToExistingRoom(){
-      useSessionStore().user.joinedRoomID = this.roomID
-      this.router().push('/room')
-    }
-  },
-}
-
-</script>
-
-<template>
-
-  <section class="games">
-
-    <article class="games__content">
-      <div class="games__container">
-        <img class="games__hand" src="/public/Vectorhand.svg" alt="hand doodle">
-      </div>
-      <BigButtonsMenu></BigButtonsMenu>
-      <div class="games__container games__container--mod">
-        <img class="games__daydream" src="/public/Vectordaydream.svg" alt="hand doodle">
-      </div>
-    </article>
-
-    <article class="multi">
-      <h3 class="multi__title">Multiplayer</h3>
-
-      <form class="multi__join">
-        <input type="text" placeholder="Room seed..."
-               v-model="roomID" class="multi__input">
-        <button @click.prevent="joinToExistingRoom" class="multi__b-mod primary-button">Enter</button>
-      </form>
-
-      <div class="multi__create">
-        <h3 class="">Or create new one</h3>
-        <button  @click="generateRoomID" class="multi__new">
-          <img  class="multi__box" alt="doodle of a box" src="/public/Vectorbox.svg">
-        </button>
-      </div>
-
-    </article>
-
-  </section>
-
-
-</template>
+<script>
+
+import BigButtonsMenu from '@/components/BigButtonsMenu.vue'
+import router from '@/router/router.js'
+import { useSessionStore } from '@/stores/sessionStore.js'
+import { v4 as uuidv4 } from 'uuid';
+
+export default {
+  name: 'Games',
+  components: { BigButtonsMenu },
+  data(){
+    return{
+      roomID: null
+    }
+  },
+
+  methods: {
+    router() {
+      return router
+    },
+    generateRoomID(){
+      useSessionStore().user.createdRoomID = uuidv4().split('-')[4]
+      useSessionStore().user.roomAdmin = true
+      this.router().push('/room')
+    },
+
+    joinToExistingRoom(){
+      useSessionStore().user.joinedRoomID = this.roomID
+      this.router().push('/room')
+    }
+  },
+}
+
+</script>
+
+<template>
+
+  <section class="games">
+
+    <article class="games__content">
+      <div class="games__container">
+        <img class="games__hand" src="/public/Vectorhand.svg" alt="hand doodle">
+      </div>
+      <BigButtonsMenu></BigButtonsMenu>
+      <div class="games__container games__container--mod">
+        <img class="games__daydream" src="/public/Vectordaydream.svg" alt="hand doodle">
+      </div>
+    </article>
+
+    <article class="multi">
+      <h3 class="multi__title">Multiplayer</h3>
+
+      <form class="multi__join">
+        <input type="text" placeholder="Room seed..."
+               v-model="roomID" class="multi__input">
+        <button @click.prevent="joinToExistingRoom" class="multi__b-mod primary-button">Enter</button>
+      </form>
+
+      <div class="multi__create">
+        <h3 class="">Or create new one</h3>
+        <button  @click="generateRoomID" class="multi__new">
+          <img  class="multi__box" alt="doodle of a box" src="/public/Vectorbox.svg">
+        </button>
+      </div>
+
+    </article>
+
+  </section>
+
+
+</template>
diff --git a/src/router/router.js b/src/router/router.js
index ff28bd3..482ce6b 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -1,11 +1,9 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
 
-import NotFound404 from '/src/pages/NotFound404.vue'
 import RootLayout from '/src/layouts/RootLayout.vue'
 import PrivateLayout from '/src/layouts/PrivateLayout.vue'
 import Home from '/src/pages/Home.vue'
 import { useSessionStore } from '@/stores/sessionStore.js'
-import Games from '@/pages/Games.vue'
 
 const routes = [
 
@@ -21,8 +19,8 @@ const routes = [
       { path: "/login", component: ()=> import('/src/pages/Login.vue')},
       { path: "/register", component: ()=> import('/src/pages/Register.vue')},
       { path: "/play", component: ()=> import('/src/pages/Games.vue')},
-      { path: "/quick", component: ()=> import('/src/pages/Games.vue')},
-      { path: "/zen", component: ()=> import('/src/pages/Games.vue')},
+      { path: "/quick", component: ()=> import('/src/pages/Quick.vue')},
+      { path: "/zen", component: ()=> import('/src/pages/Zen.vue')},
 
       // Private pages
       {
@@ -42,7 +40,7 @@ const routes = [
         path: "/profile",
         component: PrivateLayout,
         beforeEnter(to, from, next) {
-          useSessionStore().isLogged() ? next() : router.push('/')
+          useSessionStore().isLogged() ? next() : router.push('/login')
         },
         children: [
           {
@@ -69,7 +67,7 @@ const routes = [
         path: "/create",
         component: PrivateLayout,
         beforeEnter(to, from, next) {
-          useSessionStore().isLogged() ? next() : router.push('/')
+          useSessionStore().isLogged() ? next() : router.push('/login')
         },
         children: [
           {
@@ -82,7 +80,7 @@ const routes = [
       {
         path: "/records",
         beforeEnter(to, from, next) {
-          useSessionStore().isLogged() ? next() : router.push('/')
+          useSessionStore().isLogged() ? next() : router.push('/login')
         },
         component: PrivateLayout,
         children: [
@@ -96,7 +94,7 @@ const routes = [
       {
         path: "/room",
         beforeEnter(to, from, next) {
-          useSessionStore().isLogged() ? next() : router.push('/')
+          useSessionStore().isLogged() ? next() : router.push('/login')
         },
         component: PrivateLayout,
         children: [