diff --git a/Webservice/server.js b/Webservice/server.js
index a84ade1..af2973c 100644
--- a/Webservice/server.js
+++ b/Webservice/server.js
@@ -4,9 +4,9 @@ let server = require('http').createServer(app);
 let {Server} = require("socket.io");
 let io = new Server(server);
 
-let port = parseInt(process.env.PORT) || 5000;
+let port = 5000;
 server.listen(port, function () {
-    generate_log_message("", "", 'RUNNING', "PORT " + port);
+    generate_log_message("MAIN", "Server", 'RUNNING', "PORT " + port);
 });
 
 
@@ -22,9 +22,8 @@ io.on('connection', socket => {
 
         addedUser = true;
 
-        socket.join(socket.room);
-
         socket.emit('login');
+        socket.join(socket.room);
 
         socket.broadcast.to(socket.room).emit('user joined', socket.username);
 
@@ -71,8 +70,8 @@ function generate_log_message(room, user, type, message) {
     user = pad(10, user, ' ').substr(0, 10);
     type = pad(10, type, ' ').substr(0, 10);
 
-    // Reset color: \x1b[0m
-    console.info("%s[%s] [%s] [%s]\x1b[0m %s", color, room, user, type, message);
+    let reset_color = '\x1b[0m';
+    console.info("%s[%s] [%s] [%s]\x1b[0m %s", color, room, user, type, reset_color, message);
 }
 
 function pad(width, string, padding) {
diff --git a/public/index.html b/public/index.html
index d032ba9..a5d651a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,7 +8,9 @@
 
     <link href="css/components.css" rel="stylesheet">
     <link href="css/header.css" rel="stylesheet">
+
     <link href="css/chat.css" rel="stylesheet">
+    <link href="css/game.css" rel="stylesheet">
 
     <link href="css/index.css" rel="stylesheet">
 </head>
@@ -34,11 +36,10 @@
 
 </footer>
 
-<script crossorigin="anonymous"
-        integrity="sha384-cPwlPLvBTa3sKAgddT6krw0cJat7egBga3DJepJyrLl4Q9/5WLra3rrnMcyTyOnh"
-        src="https://cdn.socket.io/3.1.3/socket.io.min.js"></script>
-<script src="js/chat.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/5.1.3/pixi.min.js"></script>
+<script src="js/chat.js"></script>
+<script src="js/game.js"></script>
 <script src="js/index.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/public/js/chat.js b/public/js/chat.js
index db262ae..c1612c5 100644
--- a/public/js/chat.js
+++ b/public/js/chat.js
@@ -1,12 +1,12 @@
 let socket;
 let username = prompt("Please enter your name");
-//let room_name = prompt("Please enter room name", "1234");
+let room_name = prompt("Please enter room name");
 let connected = false;
 
 window.addEventListener('load', function () {
     socket = io();
 
-    socket.on('login', function (data) {
+    socket.on('login', function () {
         connected = true;
         addLogMessage("Welcome " + username + "!");
     });