diff --git a/docker-compose/requirements/nginx/static/javascript/Page.js b/docker-compose/requirements/nginx/static/javascript/Page.js
index 26913e7..e4bb0b0 100644
--- a/docker-compose/requirements/nginx/static/javascript/Page.js
+++ b/docker-compose/requirements/nginx/static/javascript/Page.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/25 00:00:21 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/11 17:26:02 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/13 11:05:33 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,7 +29,7 @@ class Page
 			{
 				if (window.location.pathname == thisClass.availablePages[i].url)
 				{
-					thisClass.changePage(thisClass.availablePages[i].name);
+					thisClass.changePage(thisClass.availablePages[i].name, true);
 					return ;
 				}
 			}
@@ -45,7 +45,7 @@ class Page
 		this.#showUnknownPage();
 	}
 	
-	changePage(name)
+	changePage(name, isBack = false)
 	{
 		if (this.actualPage != null)
 			this.actualPage.dispose();
@@ -67,7 +67,8 @@ class Page
 						document.body.innerHTML = text;
 						this.actualPage = this.availablePages[i].class;
 						document.title = this.availablePages[i].title;
-						history.pushState({}, this.availablePages[i].title, this.availablePages[i].url);
+						if (!isBack)
+							history.pushState({}, this.availablePages[i].title, this.availablePages[i].url);
 						this.actualPage.create();
 					})
 				})
@@ -79,7 +80,7 @@ class Page
 				return ;
 			}
 		}
-		throw Error("Page '" + page + "' not exist");
+		throw Error("Page '" + name + "' not exist");
 	}
 
 	#showUnknownPage()
diff --git a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
index 35e7eb8..b636b2a 100644
--- a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
+++ b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:19:17 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/26 11:12:50 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/13 10:53:06 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -141,11 +141,11 @@ function home3D()
 			}
 			camera.position.x -= (0.01 * globalSpeed);
 			camera.lookAt(screen.tv.position);
-			if (camera.position.x < 3.3)
+			if (camera.position.x < 3.3 && interval)
 				fadeInOut();
-			if (dofPass.materialBokeh.uniforms.aperture.value > 0)
+			if (dofPass.materialBokeh.uniforms.aperture.value > 0 && interval)
 				dofPass.materialBokeh.uniforms.aperture.value -= 0.0001;
-			if (camera.position.x < 3)
+			if (camera.position.x < 3 && interval)
 			{
 				clearInterval(interval);
 				camera.position.set(-2, 4, -6);
@@ -158,9 +158,9 @@ function home3D()
 					camera.lookAt(screen.tv.position);
 					camera.position.x += (0.01 * globalSpeed);
 					camera.position.y -= (0.005 * globalSpeed);
-					if (camera.position.x > 1.7)
+					if (camera.position.x > 1.7 && interval)
 						fadeInOut();
-					if (camera.position.x > 2)
+					if (camera.position.x > 2 && interval)
 					{
 						camera.position.set(0, 1.2, 0);
 						clearInterval(interval);
@@ -173,9 +173,9 @@ function home3D()
 							camera.lookAt(screen.tv.position);
 							camera.position.y += (0.005 * globalSpeed);
 							camera.position.z -= (0.01 * globalSpeed);
-							if (camera.position.x < -2.3)
+							if (camera.position.x < -2.3 && interval)
 								fadeInOut();
-							if (camera.position.z < -2)
+							if (camera.position.z < -2 && interval)
 							{
 								globalSpeed -= 0.001;
 								if (globalSpeed < 0)
@@ -188,11 +188,6 @@ function home3D()
 		}, 10);
 	}, 500);
 
-	setTimeout(() => {
-		screen.changeVideo(video.pong);
-		actualVideo = 0;
-	}, 100);
-
 	let	clickDetect = false;
 
 	function loop()
@@ -326,7 +321,7 @@ function home3D()
 	renderer.setAnimationLoop(loop)
 }
 
-function windowUpdater()
+function windowUpdater(e)
 {
 	renderer.setSize(window.innerWidth, window.innerHeight);
 	camera.aspect = window.innerWidth / window.innerHeight;
@@ -342,7 +337,41 @@ function mouseTracker (event)
 
 function redirection()
 {
-	pageRenderer.changePage('lobbyPage');
+	const	topBar		= document.getElementById('topBar');
+
+	topBar.style.animation = 'animHideMenuDiv 0.5s';
+	topBar.style.opacity = 0;
+	moveCamera();
+	setTimeout(() => {
+		if (interval)
+		{
+			clearInterval(interval);
+			interval = null;
+		}
+		setTimeout(() => {
+			pageRenderer.changePage('lobbyPage');
+		}, 700);
+	}, 1000);
+}
+
+function moveCamera()
+{
+	const targetPosition = screen.tv.position;
+	const initialPosition = camera.position.clone();
+	const startTime = Date.now();
+
+	function updateCameraPosition()
+	{
+		const elapsedTime = Date.now() - startTime;
+		const t = Math.min(elapsedTime / 1000, 1);
+		const position = initialPosition.clone().lerp(targetPosition, t * t);
+
+		camera.position.copy(position);
+		if (t < 1)
+			requestAnimationFrame(updateCameraPosition);
+	}
+
+	updateCameraPosition();
 }
 
 export { Home3D };
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
index 430ff56..facdf66 100644
--- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:08:46 by madegryc          #+#    #+#             */
-/*   Updated: 2024/08/25 21:20:17 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/13 10:41:51 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,6 +36,10 @@ class LobbyPage
 		listSelectCard[1].addEventListener('click', selectGameModeTwo);
 		listSelectCard[2].addEventListener('click', selectGameModeThree);
 		listSelectCard[3].addEventListener('click', selectGameModeFour);
+		for (let i = 0; i < document.body.children.length; i++)
+		{
+			document.body.children[i].style.animation = 'animShowMenuDiv 0.5s';
+		}
 	}
 
 	static dispose()
diff --git a/docker-compose/requirements/nginx/static/javascript/login/main.js b/docker-compose/requirements/nginx/static/javascript/login/main.js
index 4506ead..3263bc0 100644
--- a/docker-compose/requirements/nginx/static/javascript/login/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/login/main.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/07 17:40:15 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/12 17:44:51 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/13 11:12:15 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,32 +21,45 @@ class Login
 		const	loginButton			= document.getElementById('loginButton');
 		const	pLoginButton		= loginButton.getElementsByTagName('p')[0];
 		const	form				= document.getElementById('loginForm');
-		let		nodeText			= null;
 		const	registerButton		= document.getElementsByClassName('new-player')[0];
 		const	button42			= document.getElementsByClassName('login-42-btn')[0];
 		const	registerForm		= document.getElementById('registerForm');
 		const   loginBackButton		= document.getElementsByClassName('old-player')[0];
+		let		usernameNode		= null;
+		let		nodeText			= null;
 
 		registerButton.addEventListener('click', changeWindowLogin);
 		loginBackButton.addEventListener('click', changeWindowLoginBack);
 		button42.addEventListener('click', redirection);
-		waitForLogin().then(() => {
-			if (userMeInfo.id !== -1)
-			{
-				nodeText = document.createTextNode(userMeInfo.username);
-				loginButton.replaceChild(nodeText, pLoginButton);
-				loginButton.addEventListener('click', showMenu);
-				window.addEventListener('resize', movePopMenuLoginButton);
-				movePopMenuLoginButton();
-				initButtonPopMenuLogin();
-			}
-			else
-			{
-				loginButton.addEventListener('click', showLoginDiv);
-			}
-		});
-		form.addEventListener('submit', connect);
-		registerForm.addEventListener('submit', createAccount);
+		if (userMeInfo.id !== -1)
+		{
+			usernameNode = document.createTextNode(userMeInfo.username);
+			loginButton.replaceChild(usernameNode, pLoginButton);
+			loginButton.addEventListener('click', showMenu);
+			window.addEventListener('resize', movePopMenuLoginButton);
+			movePopMenuLoginButton();
+			initButtonPopMenuLogin();
+		}
+		else
+		{
+			waitForLogin().then(() => {
+				if (userMeInfo.id !== -1)
+				{
+					nodeText = document.createTextNode(userMeInfo.username);
+					loginButton.replaceChild(nodeText, pLoginButton);
+					loginButton.addEventListener('click', showMenu);
+					window.addEventListener('resize', movePopMenuLoginButton);
+					movePopMenuLoginButton();
+					initButtonPopMenuLogin();
+				}
+				else
+				{
+					loginButton.addEventListener('click', showLoginDiv);
+				}
+			});
+			form.addEventListener('submit', connect);
+			registerForm.addEventListener('submit', createAccount);
+		}
 	}
 
 	static dispose()
@@ -176,18 +189,18 @@ function	connect(e)
 	
 	e.preventDefault();
 	sendRequest("login", {type: "byPass", mail: mail, password: e.target.password.value});
-	// waitForLogin().then((isConnected) => {
-	// 	if (isConnected)
-	// 	{
-	// 		usernameNode = document.createTextNode(userMeInfo.username);
-	// 		loginButton.replaceChild(usernameNode, pLoginButton);
-	// 		CN.new("Connected successfully", "Welcome " + userMeInfo.username, CN.defaultIcon.success);
-	// 		popout.style.display = 'none';
-	// 	}
-	// }).catch((err) => {
-	// 	console.error(err);
-	// 	CN.new("Error", "An error occured while trying to connect", CN.defaultIcon.error);
-	// });
+	waitForLogin().then((isConnected) => {
+		if (isConnected)
+		{
+			usernameNode = document.createTextNode(userMeInfo.username);
+			loginButton.replaceChild(usernameNode, pLoginButton);
+			CN.new("Connected successfully", "Welcome " + userMeInfo.username, CN.defaultIcon.success);
+			popout.style.display = 'none';
+		}
+	}).catch((err) => {
+		console.error(err);
+		CN.new("Error", "An error occured while trying to connect", CN.defaultIcon.error);
+	});
 }
 
 export { Login, changeWindowLoginBack };
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/style/homePage/home.css b/docker-compose/requirements/nginx/static/style/homePage/home.css
index 7867b46..5751755 100644
--- a/docker-compose/requirements/nginx/static/style/homePage/home.css
+++ b/docker-compose/requirements/nginx/static/style/homePage/home.css
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/07 12:00:55 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/12 01:34:19 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/13 10:40:18 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */