diff --git a/ChatApp/app/src/main/java/client/ClientGui.java b/ChatApp/app/src/main/java/client/ClientGui.java
index 1e79997..7f065d1 100644
--- a/ChatApp/app/src/main/java/client/ClientGui.java
+++ b/ChatApp/app/src/main/java/client/ClientGui.java
@@ -3,9 +3,7 @@ package client;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
 import javafx.scene.image.Image;
-import javafx.scene.layout.StackPane;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
diff --git a/ChatApp/app/src/main/java/client/ClientLogin.java b/ChatApp/app/src/main/java/client/ClientLogin.java
index 1ed1af7..9838c1d 100644
--- a/ChatApp/app/src/main/java/client/ClientLogin.java
+++ b/ChatApp/app/src/main/java/client/ClientLogin.java
@@ -16,6 +16,9 @@ public class ClientLogin {
 
     @FXML
     private void login() throws IOException {
+        if(usernameField.getText().isEmpty()) {
+            return;
+        }
         var loader = new FXMLLoader(getClass().getResource("/client/clientLoading.fxml"));
         loader.load();
         Stage stage = (Stage) usernameField.getScene().getWindow();
diff --git a/ChatApp/app/src/main/resources/client/clientLogin.fxml b/ChatApp/app/src/main/resources/client/clientLogin.fxml
index 6793353..0018cc0 100644
--- a/ChatApp/app/src/main/resources/client/clientLogin.fxml
+++ b/ChatApp/app/src/main/resources/client/clientLogin.fxml
@@ -7,27 +7,17 @@
 <?import javafx.scene.layout.*?>
 
 <?import javafx.geometry.Insets?>
-<GridPane xmlns="http://javafx.com/javafx"
-          xmlns:fx="http://javafx.com/fxml"
-          fx:controller="client.ClientLogin"
-          prefHeight="400.0" prefWidth="600.0">
 
-    <VBox spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
-        <Label text="Enter your username"/>
-        <TextField fx:id="usernameField"/>
-        <Button text="Login" onAction="#login"/>
-    </VBox>
-
-    <columnConstraints>
-        <ColumnConstraints hgrow="ALWAYS"/>
-        <ColumnConstraints halignment="CENTER"/>
-        <ColumnConstraints hgrow="ALWAYS"/>
-    </columnConstraints>
-
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS"/>
-        <RowConstraints valignment="CENTER"/>
-        <RowConstraints vgrow="ALWAYS"/>
-    </rowConstraints>
-
-</GridPane>
+<VBox alignment="CENTER" spacing="10.0"
+      xmlns="http://javafx.com/javafx"
+      xmlns:fx="http://javafx.com/fxml"
+      fx:controller="client.ClientLogin"
+      prefHeight="400.0" prefWidth="600.0"
+    styleClass="login-box">
+    <padding>
+        <Insets bottom="10.0" left="100.0" right="100.0" top="10.0"/>
+    </padding>
+    <Label text="Enter your username"/>
+    <TextField fx:id="usernameField" onAction="#login" styleClass="login"/>
+    <Button text="Login" onAction="#login"/>
+</VBox>
\ No newline at end of file
diff --git a/ChatApp/app/src/main/resources/client/clientStyle.css b/ChatApp/app/src/main/resources/client/clientStyle.css
index e69de29..b3a8918 100644
--- a/ChatApp/app/src/main/resources/client/clientStyle.css
+++ b/ChatApp/app/src/main/resources/client/clientStyle.css
@@ -0,0 +1,11 @@
+.login-box {
+    -fx-background-color: lightgray;
+}
+
+.login {
+    -fx-border-color: transparent;
+}
+
+.login:focused {
+    -fx-border-color: lightgrey;
+}
\ No newline at end of file