diff --git a/src/__routes.svelte b/src/__routes.svelte
index c928e42..147c622 100644
--- a/src/__routes.svelte
+++ b/src/__routes.svelte
@@ -13,6 +13,36 @@
 	loading={Loading}
 	error={Error}
 	routes={[
+		//experience
+		{
+			path: '/:gameurl',
+			component: () => import('$routes/game/experience.svelte'),
+		},
+		//authorization
+		{
+			path: '/login',
+			component: () => import('$routes/authorization/login/log_in.svelte'),
+		},
+		{
+			path: '/register',
+			component: () => import('$root/src/routes/authorization/register/register.svelte'),
+		},
+		{
+			path: '/register/failed',
+			component: () => import('$routes/authorization/register/registerFailed.svelte'),
+		},
+		{
+			path: '/register/emailverification/:erantId',
+			component: () => import('$routes/authorization/register/emailVerification.svelte'),
+		},
+		{
+			path: '/create/account/:erantId/',
+			component: () => import('$routes/authorization/register/createAccount.svelte'),
+		},
+		{
+			path: '/forgot-pswd',
+			component: () => import('$routes/authorization/forgottonPassword/forgot-pswd.svelte'),
+		},
 		...[
 			{
 				path: '/',
@@ -35,9 +65,8 @@
 				component: () => import('$routes/profile/profile-functions.svelte'),
 			},
 		].map((routes) => {
-			return { ...routes, layout: NavigationBarLayout }
+			return { ...routes, layout: ArrowBackLayout }
 		}),
-
 		{
 			path: '/error',
 			component: () => import('$routes/error.svelte'),
@@ -54,37 +83,11 @@
 			path: '/map',
 			component: () => import('$root/src/routes/map/map.svelte'),
 		},
-
 		{
 			path: '/profile/',
 			component: () => import('$src/__error.svelte'),
 		},
-
-		{
-			path: '/login',
-			component: () => import('$routes/authorization/login/log_in.svelte'),
-		},
-		{
-			path: '/register',
-			component: () => import('$root/src/routes/authorization/register/register.svelte'),
-		},
-		{
-			path: '/register/failed',
-			component: () => import('$routes/authorization/register/registerFailed.svelte'),
-		},
-
-		{
-			path: '/register/emailverification/:erantId',
-			component: () => import('$routes/authorization/register/emailVerification.svelte'),
-		},
-		{
-			path: '/create/account/:erantId/',
-			component: () => import('$routes/authorization/register/createAccount.svelte'),
-		},
-		{
-			path: '/:gameurl',
-			component: () => import('$routes/game/experience.svelte'),
-		},
+		//policy
 		{
 			path: '/terms-and-conditions',
 			component: () => import('$routes/legal/terms-and-conditions.svelte'),
@@ -97,10 +100,6 @@
 			path: '/cookie-policy',
 			component: () => import('$routes/legal/cookie-policy.svelte'),
 		},
-		{
-			path: '/forgot-pswd',
-			component: () => import('$routes/authorization/forgottonPassword/forgot-pswd.svelte'),
-		},
 		{
 			path: '/preferences',
 			component: () => import('$root/src/routes/onboarding/interestsPage.svelte'),
diff --git a/src/lib/components/Layouts/NavigationBarLayout.svelte b/src/lib/components/Layouts/NavigationBarLayout.svelte
index 36bbb90..fdfb90c 100644
--- a/src/lib/components/Layouts/NavigationBarLayout.svelte
+++ b/src/lib/components/Layouts/NavigationBarLayout.svelte
@@ -6,7 +6,6 @@
 	import FooterItem from '../Common/NavBar_Item.svelte'
 
 	$: [userInfo] = collections.users.getDocument([Query.equal('userId', $user?.$id || '')])
-	$: console.log($user)
 
 	$: items = [
 		{
diff --git a/src/routes/error.svelte b/src/routes/error.svelte
index 5a81420..ac8477e 100644
--- a/src/routes/error.svelte
+++ b/src/routes/error.svelte
@@ -1,10 +1,9 @@
 <script>
-	import Overlay from '../lib/components/Layouts/LayoutImg.svelte'
-	import Section from '../lib/components/Common/Section.svelte'
-	import Button from '../lib/components/Buttons/Button.svelte'
+	import Overlay from '$lib/components/Layouts/LayoutImg.svelte'
+	import Section from '$lib/components/Common/Section.svelte'
+	import Button from '$lib/components/Buttons/Button.svelte'
 </script>
 
-
 <Overlay img="/assets/images/main.jpg">
 	<div>
 		<span>Erant</span>