diff --git a/public/scripts/login.js b/public/scripts/login.js
index 0d3d89d..2e1f88f 100644
--- a/public/scripts/login.js
+++ b/public/scripts/login.js
@@ -1,29 +1,34 @@
-const socket = io("/")
-const login = document.querySelector("#login")
 const nameButton = document.querySelector("#name")
 const nameInput = document.querySelector("#name-input")
 const nameDisplay = document.querySelector("#name-display")
 
+const loginURL = new URL("login", window.location.origin)
+try {
+    loginURL.searchParams.append("roomId", ROOM_ID)
+} catch (error) {
+    if (!error instanceof ReferenceError) throw error
+}
+
 document
     .querySelector("#change-name")
-    .addEventListener("click", () => login.classList.remove("done"))
+    ?.addEventListener("click", () => (window.location = loginURL))
 
 const yourName = localStorage.getItem("name")
 
-if (yourName) nameDisplay.innerText = yourName
-else login.classList.remove("done")
+if (!yourName && window.location.pathname != "/login")
+    window.location = loginURL
+if (yourName && nameDisplay) nameDisplay.innerText = yourName
 
 const validate = () => {
     if (!nameInput.value) return (nameInput.required = true)
-    document.querySelector("#login").classList.add("done")
     localStorage.setItem("name", nameInput.value)
-    nameDisplay.innerText = nameInput.value
-    socket.emit("name-change", nameInput.value)
+
+    window.location.href =
+        new URLSearchParams(window.location.search).get("roomId") || "/"
 }
 
-if (nameButton) nameButton.addEventListener("click", validate)
-if (nameInput)
-    nameInput.addEventListener(
-        "keydown",
-        (event) => event.keyCode == "13" && validate()
-    )
+nameButton?.addEventListener?.("click", validate)
+nameInput?.addEventListener?.(
+    "keydown",
+    (event) => event.keyCode == "13" && validate()
+)
diff --git a/public/scripts/utils.js b/public/scripts/utils.js
index 4d408d7..e15f1bb 100644
--- a/public/scripts/utils.js
+++ b/public/scripts/utils.js
@@ -70,6 +70,8 @@ export const addVideoStream = (videoContainer, username, stream, isYours) => {
 
     const video = videoContainer.querySelector("video")
     video.srcObject = stream
+    if (CSS.supports("::-webkit-media-controls-panel"))
+        video.controls = "controls"
     video.addEventListener("loadedmetadata", () => video.play())
     if (isYours) {
         video.muted = true
diff --git a/public/scripts/video.js b/public/scripts/video.js
index f10badd..6bcee53 100644
--- a/public/scripts/video.js
+++ b/public/scripts/video.js
@@ -2,10 +2,14 @@ import { addVideoStream, connectToNewUser, showNoVideoPrompt } from "./utils.js"
 const socket = io("/")
 const myPeer = new Peer()
 const template = document.querySelector("#video-template")
-const yourName = localStorage.getItem("name")
 
 myPeer.on("open", async (id) => {
     try {
+        while (!localStorage.getItem("name")) {
+            await new Promise((resolve) => setTimeout(resolve, 2000))
+        }
+        const yourName = localStorage.getItem("name")
+
         const stream = await navigator.mediaDevices.getUserMedia({
             video: true,
             audio: true,
@@ -28,13 +32,7 @@ myPeer.on("open", async (id) => {
             connectToNewUser(userId, username, stream, myPeer)
         )
     } catch (error) {
-        if (
-            error.name == "NotAllowedError" ||
-            error.name == "NotFoundError" ||
-            error.name == "PermissionDeniedError" ||
-            error.name == "DevicesNotFoundError"
-        )
-            return showNoVideoPrompt()
+        if (error instanceof DOMException) return showNoVideoPrompt()
 
         throw error
     }
diff --git a/public/style.css b/public/style.css
index c6240d4..bad9b84 100644
--- a/public/style.css
+++ b/public/style.css
@@ -21,6 +21,7 @@ body {
     height: 100vh;
     grid-auto-rows: 100vh;
     display: grid;
+    overflow: hidden;
 }
 
 #go {
@@ -41,19 +42,27 @@ main {
     background-color: var(--secondary);
 }
 
+@media (min-width: 800px) {
+    #videos {
+        grid-template-columns: repeat(auto-fit, minmax(33%, 1fr));
+    }
+}
+
 #videos {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(33%, 1fr));
     grid-template-rows: repeat(auto-fit, minmax(33%, 1fr));
     color: white;
-    max-height: 100vh;
+    height: 100vh;
+    width: 100vw;
     background-color: var(--secondary);
     gap: 2px;
 }
 
 video {
     width: 100%;
+    height: 100%;
     max-height: 100vh;
+    object-fit: cover;
 }
 
 .your-video {
@@ -72,11 +81,12 @@ video {
 }
 
 .your-video .resizer {
-    width: 10px;
-    height: 10px;
+    width: 15px;
+    height: 15px;
     background: var(--primary);
     position: absolute;
     right: 0;
+    border-radius: 5px;
     bottom: 0;
     cursor: se-resize;
 }
diff --git a/server.js b/server.js
index 226f1e1..19224b7 100644
--- a/server.js
+++ b/server.js
@@ -9,6 +9,8 @@ app.use(express.static("public"))
 
 app.get("/", (_, res) => res.render("index"))
 
+app.get("/login", (_, res) => res.render("login"))
+
 app.get("/:room", (req, res) => res.render("room", { roomId: req.params.room }))
 
 const users = {}
@@ -25,12 +27,6 @@ io.on("connection", (socket) =>
         })
 
         socket.on("get-username", (userId, callback) => callback(users[userId]))
-
-        socket.on("name-change", (name) => {
-            users[userId] = name
-
-            socket.to(roomId).emit("name-changed", userId)
-        })
     })
 )
 
diff --git a/views/index.ejs b/views/index.ejs
index 857a0ea..199397b 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -6,31 +6,11 @@
         <meta http-equiv="X-UA-Compatible" content="ie=edge" />
         <link rel="stylesheet" href="style.css" />
         <script src="/socket.io/socket.io.js" defer></script>
-        <script src="scripts/login.js" defer></script>
         <script src="scripts/goToRoom.js" type="module" defer></script>
+        <script src="scripts/login.js" defer></script>
         <title>Video Chat</title>
     </head>
     <body>
-        <div id="login" class="done">
-            <h1 class="large-header">Login</h1>
-            <div>
-                <input id="name-input" type="text" placeholder="Username" />
-                <button class="button-circle" id="name">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="25"
-                        height="25"
-                        fill="currentColor"
-                        class="bi bi-check-circle-fill"
-                        viewBox="0 0 16 16"
-                    >
-                        <path
-                            d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"
-                        />
-                    </svg>
-                </button>
-            </div>
-        </div>
         <div id="options" class="card">
             <div id="change-name">
                 <span id="name-display"></span>
diff --git a/views/login.ejs b/views/login.ejs
new file mode 100644
index 0000000..85b881b
--- /dev/null
+++ b/views/login.ejs
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+        <link rel="stylesheet" href="style.css" />
+        <script src="/socket.io/socket.io.js" defer></script>
+        <script src="scripts/login.js" defer></script>
+        <title>Video Chat</title>
+    </head>
+    <body>
+        <div id="login">
+            <h1 class="large-header">Choose a name</h1>
+            <div>
+                <input id="name-input" type="text" placeholder="Username" />
+                <button class="button-circle" id="name">
+                    <svg
+                        xmlns="http://www.w3.org/2000/svg"
+                        width="25"
+                        height="25"
+                        fill="currentColor"
+                        class="bi bi-check-circle-fill"
+                        viewBox="0 0 16 16"
+                    >
+                        <path
+                            d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"
+                        />
+                    </svg>
+                </button>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/views/room.ejs b/views/room.ejs
index 1ddc635..ae382a3 100644
--- a/views/room.ejs
+++ b/views/room.ejs
@@ -19,26 +19,6 @@
         <title>Video Chat</title>
     </head>
     <body>
-        <div id="login" class="done">
-            <h1 class="large-header">Login</h1>
-            <div>
-                <input id="name-input" type="text" placeholder="Username" />
-                <button class="button-circle" id="name">
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="25"
-                        height="25"
-                        fill="currentColor"
-                        class="bi bi-check-circle-fill"
-                        viewBox="0 0 16 16"
-                    >
-                        <path
-                            d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"
-                        />
-                    </svg>
-                </button>
-            </div>
-        </div>
         <div id="novideo">
             <h1 class="medium-header">No Video / Audio Device Found</h1>
             <div>