diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 6ebfb08..366770a 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -7,38 +7,6 @@ jobs:
   checkstyle:
     name: "Checkstyle Main"
     runs-on: "vps-4"
-    container:
-      image: "cimg/openjdk:23.0-node"
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v3
-      - name: Setup Java 23
-        uses: actions/setup-java@v3
-        with:
-          distribution: "temurin"
-          java-version: "23"
-      - name: "Cache Gradle dependencies"
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-common
-          restore-keys: |
-            gradle-${{ runner.os }}-
-      - name: "Prepare Gradle"
-        working-directory: ./backend
-        run: gradle clean
-      - name: "Check"
-        working-directory: ./backend
-        run: gradle checkstyleMain
-      - name: "Stop Gradle"
-        working-directory: ./backend
-        run: gradle --stop
-  
-  test:
-    name: "Test"
-    runs-on: "vps-4"
     container:
       image: "cimg/openjdk:22.0-node"
     steps:
@@ -49,21 +17,22 @@ jobs:
         with:
           distribution: "temurin"
           java-version: "22"
-      - name: "Cache Gradle dependencies"
-        uses: actions/cache@v3
+
+      - uses: actions/cache@v3
+        working-directory: ./backend
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-common
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            gradle-${{ runner.os }}-
+            ${{ runner.os }}-gradle-
       - name: "Prepare Gradle"
         working-directory: ./backend
         run: gradle clean
-      - name: "Test"
+      - name: "Check"
         working-directory: ./backend
-        run: gradle test
+        run: gradle checkstyleMain
       - name: "Stop Gradle"
         working-directory: ./backend
         run: gradle --stop
@@ -78,14 +47,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Install bun
         uses: oven-sh/setup-bun@v2
-      - uses: actions/cache@v3
-        working-directory: ./frontend
-        with:
-          path: |
-            frontend/node_modules/
-          key: ${{ runner.os }}-bun-
-          restore-keys: |
-            ${{ runner.os }}-bun-
       - name: Install dependencies
         run: |
           cd frontend
@@ -105,14 +66,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Install bun
         uses: oven-sh/setup-bun@v2
-      - uses: actions/cache@v3
-        working-directory: ./frontend
-        with:
-          path: |
-            frontend/node_modules/
-          key: ${{ runner.os }}-bun-
-          restore-keys: |
-            ${{ runner.os }}-bun-
       - name: Install dependencies
         run: |
           cd frontend
@@ -132,22 +85,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Install bun
         uses: oven-sh/setup-bun@v2
-      - uses: actions/cache@v3
-        working-directory: ./frontend
-        with:
-          path: |
-            frontend/node_modules/
-          key: ${{ runner.os }}-bun-
-          restore-keys: |
-            ${{ runner.os }}-bun-
-      - uses: actions/cache@v3
-        working-directory: ./frontend
-        with:
-          path: |
-            frontend/dist/
-          key: ${{ runner.os }}-dist-
-          restore-keys: |
-            ${{ runner.os }}-dist-
       - name: Install dependencies
         run: |
           cd frontend
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index a2060f7..76efd27 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -24,7 +24,7 @@ version = "0.0.1-SNAPSHOT"
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(23)
+        languageVersion = JavaLanguageVersion.of(22)
     }
 }
 
diff --git a/backend/requests/user.http b/backend/requests/user.http
deleted file mode 100644
index 5e7aa5c..0000000
--- a/backend/requests/user.http
+++ /dev/null
@@ -1,27 +0,0 @@
-### Get User by ID
-GET http://localhost:8080/user/52cc0208-a3bd-4367-94c5-0404b016a003
-Authorization: Bearer {{token}}
-
-### Get current user with token
-GET http://localhost:8080/user
-Authorization: Bearer {{token}}
-
-### Create User
-POST http://localhost:8080/user
-Content-Type: application/json
-Authorization: Bearer {{token}}
-
-{
-  "keycloakId": "52cc0208-a3bd-4367-94c5-0404b016a003",
-  "username": "john.doe"
-}
-
-### Deposit
-POST http://localhost:8080/deposit/checkout
-Content-Type: application/json
-Origin: http://localhost:8080
-Authorization: Bearer {{token}}
-
-{
-  "amount": 60.12
-}
\ No newline at end of file
diff --git a/backend/src/main/java/de/szut/casino/deposit/DepositController.java b/backend/src/main/java/de/szut/casino/deposit/DepositController.java
index 6bc0fbc..0e1ade5 100644
--- a/backend/src/main/java/de/szut/casino/deposit/DepositController.java
+++ b/backend/src/main/java/de/szut/casino/deposit/DepositController.java
@@ -3,13 +3,20 @@ package de.szut.casino.deposit;
 import com.stripe.Stripe;
 import com.stripe.exception.StripeException;
 import com.stripe.model.checkout.Session;
+import com.stripe.param.InvoiceItemCreateParams;
+import com.stripe.param.PriceCreateParams;
 import com.stripe.param.checkout.SessionCreateParams;
 import de.szut.casino.deposit.dto.AmountDto;
 import de.szut.casino.deposit.dto.SessionIdDto;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.cassandra.CassandraProperties;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class DepositController {
@@ -17,11 +24,11 @@ public class DepositController {
     @Value("${stripe.secret.key}")
     private String stripeKey;
 
-    @Value("${app.frontend-host}")
-    private String frontendHost;
-
     @PostMapping("/deposit/checkout")
-    public ResponseEntity<SessionIdDto> checkout(@RequestBody @Valid AmountDto amountDto) throws StripeException {
+    public ResponseEntity<SessionIdDto> checkout(
+            @RequestBody @Valid AmountDto amountDto,
+            @RequestHeader("Origin") String origin
+    ) throws StripeException {
         Stripe.apiKey = stripeKey;
 
         SessionCreateParams params = SessionCreateParams.builder()
@@ -31,8 +38,7 @@ public class DepositController {
                         .setQuantity(1L)
                         .setName("Einzahlung")
                         .build())
-                .setSuccessUrl(frontendHost+"/home?success=true")
-                .setCancelUrl(frontendHost+"/home?success=false")
+                .setSuccessUrl(origin+"/deposit/success")
                 .setMode(SessionCreateParams.Mode.PAYMENT)
                 .build();
 
diff --git a/backend/src/main/java/de/szut/casino/security/KeycloakSecurityConfig.java b/backend/src/main/java/de/szut/casino/security/KeycloakSecurityConfig.java
index 6be8b83..8ddcbcb 100644
--- a/backend/src/main/java/de/szut/casino/security/KeycloakSecurityConfig.java
+++ b/backend/src/main/java/de/szut/casino/security/KeycloakSecurityConfig.java
@@ -14,6 +14,7 @@ import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +24,10 @@ import java.util.Map;
 @EnableWebSecurity
 class KeycloakSecurityConfig {
 
+    private static final String GROUPS = "groups";
+    private static final String REALM_ACCESS_CLAIM = "realm_access";
+    private static final String ROLES_CLAIM = "roles";
+
     private final KeycloakLogoutHandler keycloakLogoutHandler;
 
     KeycloakSecurityConfig(KeycloakLogoutHandler keycloakLogoutHandler) {
diff --git a/backend/src/main/java/de/szut/casino/user/UserEntity.java b/backend/src/main/java/de/szut/casino/user/UserEntity.java
index 83d8f44..f6c1a5b 100644
--- a/backend/src/main/java/de/szut/casino/user/UserEntity.java
+++ b/backend/src/main/java/de/szut/casino/user/UserEntity.java
@@ -4,10 +4,10 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import java.math.BigDecimal;
 
 @Setter
 @Getter
@@ -20,11 +20,9 @@ public class UserEntity {
     @Column(unique = true)
     private String keycloakId;
     private String username;
+    private float balance;
 
-    @Column(precision = 19, scale = 2)
-    private BigDecimal balance;
-
-    public UserEntity(String keycloakId, String username, BigDecimal balance) {
+    public UserEntity(String keycloakId, String username, float balance) {
         this.keycloakId = keycloakId;
         this.username = username;
         this.balance = balance;
diff --git a/backend/src/main/java/de/szut/casino/user/UserMappingService.java b/backend/src/main/java/de/szut/casino/user/UserMappingService.java
index 80f5546..e0183ec 100644
--- a/backend/src/main/java/de/szut/casino/user/UserMappingService.java
+++ b/backend/src/main/java/de/szut/casino/user/UserMappingService.java
@@ -4,8 +4,6 @@ import de.szut.casino.user.dto.CreateUserDto;
 import de.szut.casino.user.dto.GetUserDto;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 @Service
 public class UserMappingService {
     public GetUserDto mapToGetUserDto(UserEntity user) {
@@ -13,6 +11,7 @@ public class UserMappingService {
     }
 
     public UserEntity mapToUserEntity(CreateUserDto createUserDto) {
-        return new UserEntity(createUserDto.getKeycloakId(), createUserDto.getUsername(), BigDecimal.ZERO);    }
+        return new UserEntity(createUserDto.getKeycloakId(), createUserDto.getUsername(), 0);
+    }
 }
 
diff --git a/backend/src/main/java/de/szut/casino/user/dto/GetUserDto.java b/backend/src/main/java/de/szut/casino/user/dto/GetUserDto.java
index 8521029..fb690af 100644
--- a/backend/src/main/java/de/szut/casino/user/dto/GetUserDto.java
+++ b/backend/src/main/java/de/szut/casino/user/dto/GetUserDto.java
@@ -5,8 +5,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.math.BigDecimal;
-
 @Getter
 @Setter
 @AllArgsConstructor
@@ -14,5 +12,5 @@ import java.math.BigDecimal;
 public class GetUserDto {
     private String keycloakId;
     private String username;
-    private BigDecimal balance;
+    private float balance;
 }
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index c7ccadf..268279f 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -4,7 +4,6 @@ spring.datasource.password=postgres_pass
 server.port=8080
 spring.jpa.hibernate.ddl-auto=create-drop
 stripe.secret.key=${STRIPE_SECRET_KEY:sk_test_51QrePYIvCfqz7ANgqam8rEwWcMeKiLOof3j6SCMgu2sl4sESP45DJxca16mWcYo1sQaiBv32CMR6Z4AAAGQPCJo300ubuZKO8I}
-app.frontend-host=http://localhost:4200
 
 spring.application.name=lf12_starter
 #client registration configuration
diff --git a/backend/src/test/java/de/szut/casino/health/HealthControllerTest.java b/backend/src/test/java/de/szut/casino/health/HealthControllerTest.java
deleted file mode 100644
index 1214c7a..0000000
--- a/backend/src/test/java/de/szut/casino/health/HealthControllerTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.szut.casino.health;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.test.web.servlet.MockMvc;
-
-@WebMvcTest(HealthController.class)
-@AutoConfigureMockMvc(addFilters = false)
-public class HealthControllerTest {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Test
-    void healthCheckReturnsUpStatus() throws Exception {
-        mockMvc.perform(get("/health"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.status").value("UP"));
-    }
-}
\ No newline at end of file
diff --git a/backend/src/test/java/de/szut/casino/user/UserControllerTest.java b/backend/src/test/java/de/szut/casino/user/UserControllerTest.java
deleted file mode 100644
index 2addb43..0000000
--- a/backend/src/test/java/de/szut/casino/user/UserControllerTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package de.szut.casino.user;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import de.szut.casino.user.dto.CreateUserDto;
-import de.szut.casino.user.dto.GetUserDto;
-
-@WebMvcTest(UserController.class)
-@AutoConfigureMockMvc(addFilters = false)
-public class UserControllerTest {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @MockBean
-    private UserService userService;
-
-    private GetUserDto getUserDto;
-    private CreateUserDto createUserDto;
-    private UserEntity testUser;
-    private final String TEST_ID = "test-id-123";
-    private final String AUTH_TOKEN = "Bearer test-token";
-
-    @BeforeEach
-    void setUp() {
-        getUserDto = new GetUserDto();
-        getUserDto.setKeycloakId(TEST_ID);
-        getUserDto.setUsername("testuser");
-
-        testUser = new UserEntity();
-        testUser.setKeycloakId(TEST_ID);
-        testUser.setUsername("testuser");
-
-        createUserDto = new CreateUserDto();
-        createUserDto.setKeycloakId(TEST_ID);
-        createUserDto.setUsername("testuser");
-    }
-
-    @Test
-    void getUserByIdSuccess() throws Exception {
-        when(userService.exists(TEST_ID)).thenReturn(true);
-        when(userService.getUser(TEST_ID)).thenReturn(getUserDto);
-
-        mockMvc.perform(get("/user/" + TEST_ID))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.keycloakId").value(TEST_ID))
-                .andExpect(jsonPath("$.username").value("testuser"));
-    }
-
-    @Test
-    void getUserByIdNotFound() throws Exception {
-        when(userService.exists(TEST_ID)).thenReturn(false);
-
-        mockMvc.perform(get("/user/" + TEST_ID))
-                .andExpect(status().isNotFound());
-    }
-
-    @Test
-    void createUserSuccess() throws Exception {
-        when(userService.exists(TEST_ID)).thenReturn(false);
-        when(userService.createUser(any(CreateUserDto.class))).thenReturn(testUser);
-
-        mockMvc.perform(post("/user")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(createUserDto)))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.keycloakId").value(TEST_ID))
-                .andExpect(jsonPath("$.username").value("testuser"));
-    }
-
-    @Test
-    void createUserAlreadyExists() throws Exception {
-        when(userService.exists(TEST_ID)).thenReturn(true);
-
-        mockMvc.perform(post("/user")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(createUserDto)))
-                .andExpect(status().isFound())
-                .andExpect(header().string("Location", "/user/" + TEST_ID));
-    }
-
-    @Test
-    void getCurrentUserSuccess() throws Exception {
-        when(userService.getCurrentUser(AUTH_TOKEN)).thenReturn(getUserDto);
-
-        mockMvc.perform(get("/user")
-                        .header("Authorization", AUTH_TOKEN))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.keycloakId").value(TEST_ID))
-                .andExpect(jsonPath("$.username").value("testuser"));
-    }
-
-    @Test
-    void getCurrentUserNotFound() throws Exception {
-        when(userService.getCurrentUser(anyString())).thenReturn(null);
-
-        mockMvc.perform(get("/user")
-                        .header("Authorization", AUTH_TOKEN))
-                .andExpect(status().isNotFound());
-    }
-}
\ No newline at end of file
diff --git a/frontend/bun.lock b/frontend/bun.lock
index 5b0629c..91de068 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -10,6 +10,7 @@
         "@angular/compiler": "^18.2.0",
         "@angular/core": "^18.2.0",
         "@angular/forms": "^18.2.0",
+        "@angular/material": "~18.2.14",
         "@angular/platform-browser": "^18.2.0",
         "@angular/platform-browser-dynamic": "^18.2.0",
         "@angular/router": "^18.2.0",
@@ -19,7 +20,6 @@
         "@fortawesome/free-solid-svg-icons": "^6.7.2",
         "@stripe/stripe-js": "^5.6.0",
         "@tailwindcss/postcss": "^4.0.3",
-        "gsap": "^3.12.7",
         "keycloak-angular": "^16.0.1",
         "keycloak-js": "^25.0.5",
         "postcss": "^8.5.1",
@@ -93,6 +93,8 @@
 
     "@angular/forms": ["@angular/forms@18.2.13", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": "18.2.13", "@angular/core": "18.2.13", "@angular/platform-browser": "18.2.13", "rxjs": "^6.5.3 || ^7.4.0" } }, "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg=="],
 
+    "@angular/material": ["@angular/material@18.2.14", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "^18.0.0 || ^19.0.0", "@angular/cdk": "18.2.14", "@angular/common": "^18.0.0 || ^19.0.0", "@angular/core": "^18.0.0 || ^19.0.0", "@angular/forms": "^18.0.0 || ^19.0.0", "@angular/platform-browser": "^18.0.0 || ^19.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "sha512-28pxzJP49Mymt664WnCtPkKeg7kXUsQKTKGf/Kl95rNTEdTJLbnlcc8wV0rT0yQNR7kXgpfBnG7h0ETLv/iu5Q=="],
+
     "@angular/platform-browser": ["@angular/platform-browser@18.2.13", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "18.2.13", "@angular/common": "18.2.13", "@angular/core": "18.2.13" }, "optionalPeers": ["@angular/animations"] }, "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q=="],
 
     "@angular/platform-browser-dynamic": ["@angular/platform-browser-dynamic@18.2.13", "", { "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": "18.2.13", "@angular/compiler": "18.2.13", "@angular/core": "18.2.13", "@angular/platform-browser": "18.2.13" } }, "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg=="],
@@ -1069,8 +1071,6 @@
 
     "graphemer": ["graphemer@1.4.0", "", {}, "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="],
 
-    "gsap": ["gsap@3.12.7", "", {}, "sha512-V4GsyVamhmKefvcAKaoy0h6si0xX7ogwBoBSs2CTJwt7luW0oZzC0LhdkyuKV8PJAXr7Yaj8pMjCKD4GJ+eEMg=="],
-
     "handle-thing": ["handle-thing@2.0.1", "", {}, "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="],
 
     "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
diff --git a/frontend/package.json b/frontend/package.json
index 0ad0967..c79aae0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,6 +19,7 @@
     "@angular/compiler": "^18.2.0",
     "@angular/core": "^18.2.0",
     "@angular/forms": "^18.2.0",
+    "@angular/material": "~18.2.14",
     "@angular/platform-browser": "^18.2.0",
     "@angular/platform-browser-dynamic": "^18.2.0",
     "@angular/router": "^18.2.0",
@@ -28,7 +29,6 @@
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@stripe/stripe-js": "^5.6.0",
     "@tailwindcss/postcss": "^4.0.3",
-    "gsap": "^3.12.7",
     "keycloak-angular": "^16.0.1",
     "keycloak-js": "^25.0.5",
     "postcss": "^8.5.1",
@@ -53,4 +53,4 @@
     "typescript": "~5.5.2",
     "typescript-eslint": "8.23.0"
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/public/blackjack.webp b/frontend/public/blackjack.webp
deleted file mode 100644
index a791c14..0000000
Binary files a/frontend/public/blackjack.webp and /dev/null differ
diff --git a/frontend/public/liars-dice.webp b/frontend/public/liars-dice.webp
deleted file mode 100644
index df1fd1c..0000000
Binary files a/frontend/public/liars-dice.webp and /dev/null differ
diff --git a/frontend/public/lootbox.webp b/frontend/public/lootbox.webp
deleted file mode 100644
index 710deed..0000000
Binary files a/frontend/public/lootbox.webp and /dev/null differ
diff --git a/frontend/public/plinko.webp b/frontend/public/plinko.webp
deleted file mode 100644
index c11370b..0000000
Binary files a/frontend/public/plinko.webp and /dev/null differ
diff --git a/frontend/public/poker.webp b/frontend/public/poker.webp
deleted file mode 100644
index 9c60024..0000000
Binary files a/frontend/public/poker.webp and /dev/null differ
diff --git a/frontend/public/slots.webp b/frontend/public/slots.webp
deleted file mode 100644
index 5cf639a..0000000
Binary files a/frontend/public/slots.webp and /dev/null differ
diff --git a/frontend/src/app/feature/deposit/deposit.component.html b/frontend/src/app/feature/deposit/deposit.component.html
index e8e4dfb..707d145 100644
--- a/frontend/src/app/feature/deposit/deposit.component.html
+++ b/frontend/src/app/feature/deposit/deposit.component.html
@@ -1,25 +1,21 @@
-@if (isOpen) {
-  <div #modalBg class="modal-bg">
-    <div #modalCard class="modal-card">
-      <h2 class="modal-heading">Guthaben aufladen</h2>
-      <form [formGroup]="form">
-        @if (errorMsg) {
-          {{ errorMsg }}
-        }
-        <div class="mb-2">
-          <label for="amount">Betrag</label>
-          <input
-            type="number"
-            id="amount"
-            formControlName="amount"
-            class="w-full px-2 py-1 bg-deep-blue-light text-white rounded my-1"
-          />
-        </div>
-      </form>
-      <div class="my-1">
-        <button (click)="closeModal()" class="button-secondary">Abbrechen</button>
-        <button (click)="submit()" class="button-primary w-full py-2">Einzahlen</button>
-      </div>
+<h2 mat-dialog-title class="text-xl font-semibold">Guthaben aufladen</h2>
+<mat-dialog-content>
+  <form [formGroup]="form">
+    <div *ngIf="errorMsg">
+      {{ errorMsg }}
     </div>
-  </div>
-}
+    <div class="mb-2">
+      <label for="amount">Betrag</label>
+      <input
+        type="number"
+        id="amount"
+        formControlName="amount"
+        class="w-full px-2 py-1 bg-white text-black"
+      />
+    </div>
+  </form>
+</mat-dialog-content>
+<mat-dialog-actions>
+  <button mat-flat-button (click)="closeDialog()">Abbrechen</button>
+  <button mat-flat-button (click)="submit()">Einzahlen</button>
+</mat-dialog-actions>
diff --git a/frontend/src/app/feature/deposit/deposit.component.ts b/frontend/src/app/feature/deposit/deposit.component.ts
index f0f900a..36ec63f 100644
--- a/frontend/src/app/feature/deposit/deposit.component.ts
+++ b/frontend/src/app/feature/deposit/deposit.component.ts
@@ -1,46 +1,38 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  inject,
-  Input,
-  OnInit,
-  Output,
-  ViewChild,
-  AfterViewInit,
-  OnDestroy,
-  OnChanges,
-  SimpleChanges,
-  ChangeDetectorRef,
-} from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { loadStripe, Stripe } from '@stripe/stripe-js';
 import { DepositService } from '../../service/deposit.service';
 import { debounceTime } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { NgIf } from '@angular/common';
-import { ModalAnimationService } from '../../shared/services/modal-animation.service';
-import gsap from 'gsap';
+import {
+  MatDialogActions,
+  MatDialogContent,
+  MatDialogRef,
+  MatDialogTitle,
+} from '@angular/material/dialog';
+import { MatButton } from '@angular/material/button';
 
 @Component({
   selector: 'app-deposit',
   standalone: true,
-  imports: [ReactiveFormsModule, NgIf],
+  imports: [
+    ReactiveFormsModule,
+    NgIf,
+    MatDialogTitle,
+    MatDialogContent,
+    MatDialogActions,
+    MatButton,
+  ],
   templateUrl: './deposit.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DepositComponent implements OnInit, AfterViewInit, OnDestroy, OnChanges {
-  @Input() isOpen = false;
-  @Output() close = new EventEmitter<void>();
-  @ViewChild('modalBg') modalBg!: ElementRef;
-  @ViewChild('modalCard') modalCard!: ElementRef;
+export class DepositComponent implements OnInit {
   protected form!: FormGroup;
   protected errorMsg = '';
   private stripe: Stripe | null = null;
   private service: DepositService = inject(DepositService);
-  private modalAnimationService: ModalAnimationService = inject(ModalAnimationService);
-  private cdr: ChangeDetectorRef = inject(ChangeDetectorRef);
+  public dialogRef: MatDialogRef<DepositComponent> = inject(MatDialogRef<DepositComponent>);
 
   async ngOnInit() {
     this.form = new FormGroup({
@@ -56,40 +48,6 @@ export class DepositComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
     this.stripe = await loadStripe(environment.STRIPE_KEY);
   }
 
-  ngAfterViewInit() {
-    if (this.isOpen) {
-      this.openModal();
-    }
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['isOpen']) {
-      this.cdr.detectChanges();
-      setTimeout(() => {
-        if (this.modalBg?.nativeElement && this.modalCard?.nativeElement) {
-          if (changes['isOpen'].currentValue) {
-            this.openModal();
-          } else {
-            this.closeModal();
-          }
-        }
-      }, 0);
-    }
-  }
-
-  ngOnDestroy() {
-    gsap.killTweensOf([this.modalBg?.nativeElement, this.modalCard?.nativeElement]);
-  }
-
-  private openModal() {
-    if (this.modalBg?.nativeElement && this.modalCard?.nativeElement) {
-      this.modalAnimationService.openModal(
-        this.modalCard.nativeElement,
-        this.modalBg.nativeElement
-      );
-    }
-  }
-
   submit() {
     if (!this.stripe) {
       this.errorMsg = 'Ein Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.';
@@ -105,13 +63,7 @@ export class DepositComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
     });
   }
 
-  public closeModal() {
-    if (this.modalBg?.nativeElement && this.modalCard?.nativeElement) {
-      this.modalAnimationService.closeModal(
-        this.modalCard.nativeElement,
-        this.modalBg.nativeElement,
-        () => this.close.emit()
-      );
-    }
+  public closeDialog(): void {
+    this.dialogRef.close();
   }
 }
diff --git a/frontend/src/app/feature/home/home.component.html b/frontend/src/app/feature/home/home.component.html
index fb2424a..27cec95 100644
--- a/frontend/src/app/feature/home/home.component.html
+++ b/frontend/src/app/feature/home/home.component.html
@@ -1,110 +1,19 @@
 <app-navbar></app-navbar>
-<div class="container mx-auto px-4 py-6 space-y-8">
-  <div class="flex justify-between items-center">
-    <div class="flex items-center space-x-4"></div>
+
+<div class="grid grid-cols-3">
+  <div class="w-1/3 h-1/4">
+    <p>Spiel Vorschau</p>
+    <p>Spiel Name</p>
+    <button type="button" class="btn-primary">Jetzt spielen</button>
   </div>
-
-  <div class="grid grid-cols-1 lg:grid-cols-4 gap-6">
-    <div class="lg:col-span-3">
-      <div class="flex justify-between items-center mb-6">
-        <h3 class="section-heading text-2xl">Beliebte Spiele</h3>
-        <div class="flex space-x-2">
-          <button class="nav-button left-0">
-            <span class="material-icons">chevron_left</span>
-          </button>
-          <button class="nav-button right-0">
-            <span class="material-icons">chevron_right</span>
-          </button>
-        </div>
-      </div>
-
-      <div class="slider-container">
-        <div class="slider-grid">
-          <div class="card group" *ngFor="let game of featuredGames">
-            <div class="relative overflow-hidden rounded-lg">
-              <img
-                [src]="game.image"
-                [alt]="game.name"
-                class="w-full aspect-[4/3] object-cover transition-transform duration-300 group-hover:scale-105"
-              />
-              <div
-                class="absolute inset-0 bg-gradient-to-t from-deep-blue/95 via-deep-blue/50 to-transparent opacity-0 group-hover:opacity-100 transition-all duration-300 ease-in-out"
-              >
-                <div
-                  class="absolute bottom-4 left-4 right-4 transform translate-y-4 group-hover:translate-y-0 transition-transform duration-300"
-                >
-                  <h4 class="game-heading">{{ game.name }}</h4>
-                  <button class="button-primary w-full py-2">Jetzt Spielen</button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="mt-8">
-        <h3 class="section-heading text-2xl mb-6">Alle Spiele</h3>
-        <div class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-4">
-          <div class="card group" *ngFor="let game of allGames">
-            <div class="relative overflow-hidden rounded-lg">
-              <img
-                [src]="game.image"
-                [alt]="game.name"
-                class="w-full aspect-[4/3] object-cover transition-transform duration-300 group-hover:scale-105"
-              />
-              <div
-                class="absolute inset-0 bg-gradient-to-t from-deep-blue/95 via-deep-blue/50 to-transparent opacity-0 group-hover:opacity-100 transition-all duration-300 ease-in-out"
-              >
-                <div
-                  class="absolute bottom-4 left-4 right-4 transform translate-y-4 group-hover:translate-y-0 transition-transform duration-300"
-                >
-                  <h4 class="game-heading">{{ game.name }}</h4>
-                  <button class="button-primary w-full py-2">Jetzt Spielen</button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="lg:col-span-1 space-y-6">
-      <div class="card p-4">
-        <h3 class="section-heading text-xl mb-4">Konto</h3>
-        <div class="space-y-4">
-          <button class="button-primary w-full py-2" (click)="openDepositModal()">Einzahlen</button>
-          <app-deposit [isOpen]="isDepositModalOpen" (close)="closeDepositModal()"></app-deposit>
-          <button class="bg-deep-blue-light hover:bg-deep-blue-contrast w-full py-2 rounded">
-            Transaktionen
-          </button>
-          <button class="bg-deep-blue-light hover:bg-deep-blue-contrast w-full py-2 rounded">
-            Kontoeinstellungen
-          </button>
-        </div>
-      </div>
-
-      <app-confirmation
-        [successful]="isDepositSuccessful"
-        (close)="closeDepositConfirmationModal()"
-      ></app-confirmation>
-
-      <div class="card p-4">
-        <h3 class="section-heading text-xl mb-4">Letzte Transaktionen</h3>
-        <div class="space-y-3">
-          <div
-            class="flex justify-between items-center"
-            *ngFor="let transaction of recentTransactions"
-          >
-            <div>
-              <p class="text-sm font-medium">{{ transaction.type }}</p>
-              <p class="text-xs text-text-secondary">{{ transaction.date }}</p>
-            </div>
-            <span [class]="transaction.amount > 0 ? 'text-emerald' : 'text-accent-red'">
-              {{ transaction.amount | currency: 'EUR' }}
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
+  <div class="w-1/3 h-1/4">
+    <p>Spiel Vorschau</p>
+    <p>Spiel Name</p>
+    <button type="button" class="btn-primary">Jetzt spielen</button>
+  </div>
+  <div class="w-1/3 h-1/4">
+    <p>Spiel Vorschau</p>
+    <p>Spiel Name</p>
+    <button type="button" class="btn-primary">Jetzt spielen</button>
   </div>
 </div>
diff --git a/frontend/src/app/feature/home/home.component.ts b/frontend/src/app/feature/home/home.component.ts
index 88fe552..d560eb8 100644
--- a/frontend/src/app/feature/home/home.component.ts
+++ b/frontend/src/app/feature/home/home.component.ts
@@ -1,80 +1,27 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { NavbarComponent } from '../../shared/components/navbar/navbar.component';
-import { CurrencyPipe, NgFor } from '@angular/common';
-import { Game } from '../../model/Game';
-import { Transaction } from '../../model/Transaction';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { KeycloakService } from 'keycloak-angular';
+import { MatDialog } from '@angular/material/dialog';
 import { DepositComponent } from '../deposit/deposit.component';
-import { ConfirmationComponent } from '../../shared/components/confirmation/confirmation.component';
-import { ActivatedRoute } from '@angular/router';
 
+import { NavbarComponent } from '../../shared/components/navbar/navbar.component';
 @Component({
   selector: 'app-homepage',
   standalone: true,
-  imports: [NavbarComponent, CurrencyPipe, NgFor, DepositComponent, ConfirmationComponent],
+  imports: [NavbarComponent],
   templateUrl: './home.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export default class HomeComponent implements OnInit {
-  isDepositModalOpen = false;
-  isDepositSuccessful = false;
+export default class HomeComponent {
+  private keycloakService: KeycloakService = inject(KeycloakService);
+  public dialog: MatDialog = inject(MatDialog);
 
-  constructor(public route: ActivatedRoute) {}
+  public logout() {
+    const baseUrl = window.location.origin;
 
-  ngOnInit() {
-    this.isDepositSuccessful = this.route.snapshot.queryParams['success'] == 'true';
-    if (this.isDepositSuccessful) {
-      this.openDepositConfirmationModal();
-    }
+    this.keycloakService.logout(`${baseUrl}/`);
   }
 
-  featuredGames: Game[] = [
-    {
-      id: '1',
-      name: 'Poker',
-      image: '/poker.webp',
-    },
-    {
-      id: '2',
-      name: 'Blackjack',
-      image: '/blackjack.webp',
-    },
-    {
-      id: '3',
-      name: 'Slots',
-      image: '/slots.webp',
-    },
-    {
-      id: '4',
-      name: 'Plinko',
-      image: '/plinko.webp',
-    },
-    {
-      id: '5',
-      name: 'Liars Dice',
-      image: '/liars-dice.webp',
-    },
-    {
-      id: '6',
-      name: 'Lootboxen',
-      image: '/lootbox.webp',
-    },
-  ];
-
-  allGames: Game[] = [...this.featuredGames];
-
-  recentTransactions: Transaction[] = [];
-
-  openDepositModal() {
-    this.isDepositModalOpen = true;
-  }
-  closeDepositModal() {
-    this.isDepositModalOpen = false;
-  }
-
-  openDepositConfirmationModal() {
-    this.isDepositSuccessful = true;
-  }
-  closeDepositConfirmationModal() {
-    this.isDepositSuccessful = false;
+  public openDialog() {
+    this.dialog.open(DepositComponent);
   }
 }
diff --git a/frontend/src/app/feature/landing/landing.component.html b/frontend/src/app/feature/landing/landing.component.html
index bffa9ad..63c67cd 100644
--- a/frontend/src/app/feature/landing/landing.component.html
+++ b/frontend/src/app/feature/landing/landing.component.html
@@ -10,7 +10,7 @@
         <div class="welcome-bonus">200% bis zu 500€</div>
         <p class="bonus-description">+ 200 Freispiele</p>
 
-        <button class="w-full sm:w-auto button-primary px-6 sm:px-8 py-3 shadow-lg">
+        <button class="w-full sm:w-auto button-base px-6 sm:px-8 py-3 shadow-lg">
           Bonus Sichern
         </button>
       </div>
@@ -26,23 +26,23 @@
               <div class="slider-grid">
                 <div class="card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Slots</h3>
+                    <h3 class="game-heading">Slots</h3>
                     <p class="game-text">Klassische Spielautomaten</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
                 <div class="card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Plinko</h3>
+                    <h3 class="game-heading">Plinko</h3>
                     <p class="game-text">Spannendes Geschicklichkeitsspiel</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
                 <div class="hidden lg:block card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Blackjack</h3>
+                    <h3 class="game-heading">Blackjack</h3>
                     <p class="game-text">Klassisches Kartenspiel</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
               </div>
@@ -50,23 +50,23 @@
               <div class="slider-grid">
                 <div class="card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Poker</h3>
+                    <h3 class="game-heading">Poker</h3>
                     <p class="game-text">Texas Hold'em & mehr</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
                 <div class="card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Liars Dice</h3>
+                    <h3 class="game-heading">Liars Dice</h3>
                     <p class="game-text">Würfelspiel mit Strategie</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
                 <div class="hidden lg:block card">
                   <div class="game-card-content">
-                    <h3 class="game-heading-sm">Lootboxen</h3>
+                    <h3 class="game-heading">Lootboxen</h3>
                     <p class="game-text">Überraschungskisten</p>
-                    <button class="button-primary w-full py-2">Jetzt Spielen</button>
+                    <button class="button-base w-full py-2">Jetzt Spielen</button>
                   </div>
                 </div>
               </div>
diff --git a/frontend/src/app/feature/login-success/login-success.component.ts b/frontend/src/app/feature/login-success/login-success.component.ts
index 067afe6..bf81ac6 100644
--- a/frontend/src/app/feature/login-success/login-success.component.ts
+++ b/frontend/src/app/feature/login-success/login-success.component.ts
@@ -21,6 +21,6 @@ export default class LoginSuccessComponent implements OnInit {
     const user = await this.userService.getOrCreateUser(userProfile);
     sessionStorage.setItem('user', JSON.stringify(user));
 
-    this.router.navigate(['home']);
+    this.router.navigate(['']);
   }
 }
diff --git a/frontend/src/app/model/Game.ts b/frontend/src/app/model/Game.ts
deleted file mode 100644
index a3f3e74..0000000
--- a/frontend/src/app/model/Game.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface Game {
-  id: string;
-  name: string;
-  image: string;
-}
diff --git a/frontend/src/app/model/Transaction.ts b/frontend/src/app/model/Transaction.ts
deleted file mode 100644
index 21277b4..0000000
--- a/frontend/src/app/model/Transaction.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface Transaction {
-  id: string;
-  type: string;
-  amount: number;
-  date: string;
-}
diff --git a/frontend/src/app/service/user.service.ts b/frontend/src/app/service/user.service.ts
index 20573ff..ba6bead 100644
--- a/frontend/src/app/service/user.service.ts
+++ b/frontend/src/app/service/user.service.ts
@@ -14,10 +14,6 @@ export class UserService {
     return this.http.get<User | null>(`/backend/user/${id}`).pipe(catchError(() => EMPTY));
   }
 
-  public getCurrentUser(): Observable<User | null> {
-    return this.http.get<User | null>('/backend/user').pipe(catchError(() => EMPTY));
-  }
-
   public createUser(id: string, username: string): Observable<User> {
     return this.http.post<User>('/backend/user', {
       keycloakId: id,
diff --git a/frontend/src/app/shared/components/confirmation/confirmation.component.html b/frontend/src/app/shared/components/confirmation/confirmation.component.html
deleted file mode 100644
index 193ea9a..0000000
--- a/frontend/src/app/shared/components/confirmation/confirmation.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-@if (successful) {
-  <div #modalBg class="modal-bg">
-    <div #modalCard class="modal-card">
-      <h2 class="modal-heading text-center">Bestätigung</h2>
-      <p class="py-2">Der Vorgang wurde erfolgreich abgeschlossen.</p>
-      <button type="button" class="button-primary w-full py-2 my-auto" (click)="closeModal()">
-        Schließen
-      </button>
-    </div>
-  </div>
-}
diff --git a/frontend/src/app/shared/components/confirmation/confirmation.component.ts b/frontend/src/app/shared/components/confirmation/confirmation.component.ts
deleted file mode 100644
index d407985..0000000
--- a/frontend/src/app/shared/components/confirmation/confirmation.component.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  Output,
-  ViewChild,
-  AfterViewInit,
-  OnDestroy,
-} from '@angular/core';
-import { ModalAnimationService } from '../../services/modal-animation.service';
-import gsap from 'gsap';
-
-@Component({
-  selector: 'app-confirmation',
-  standalone: true,
-  imports: [],
-  templateUrl: './confirmation.component.html',
-})
-export class ConfirmationComponent implements AfterViewInit, OnDestroy {
-  @Input() successful = true;
-  @Output() close = new EventEmitter<void>();
-  @ViewChild('modalBg') modalBg!: ElementRef;
-  @ViewChild('modalCard') modalCard!: ElementRef;
-
-  constructor(private modalAnimationService: ModalAnimationService) {}
-
-  ngAfterViewInit() {
-    if (this.successful) {
-      this.openModal();
-    }
-  }
-
-  ngOnDestroy() {
-    gsap.killTweensOf([this.modalBg?.nativeElement, this.modalCard?.nativeElement]);
-  }
-
-  private openModal() {
-    this.modalAnimationService.openModal(this.modalCard.nativeElement, this.modalBg.nativeElement);
-  }
-
-  public closeModal() {
-    this.modalAnimationService.closeModal(
-      this.modalCard.nativeElement,
-      this.modalBg.nativeElement,
-      () => this.close.emit()
-    );
-  }
-}
diff --git a/frontend/src/app/shared/components/footer/footer.component.html b/frontend/src/app/shared/components/footer/footer.component.html
index e886973..87c4682 100644
--- a/frontend/src/app/shared/components/footer/footer.component.html
+++ b/frontend/src/app/shared/components/footer/footer.component.html
@@ -47,7 +47,7 @@
           </div>
           <div class="footer-payment-method">
             <fa-icon [icon]="faWallet" class="footer-payment-icon"></fa-icon>
-            <span class="footer-payment-text">Klarna</span>
+            <span class="footer-payment-text">Klara</span>
           </div>
           <div class="footer-payment-method">
             <fa-icon [icon]="faMoneyBillTransfer" class="footer-payment-icon"></fa-icon>
diff --git a/frontend/src/app/shared/components/navbar/navbar.component.html b/frontend/src/app/shared/components/navbar/navbar.component.html
index daa53f7..fa492ae 100644
--- a/frontend/src/app/shared/components/navbar/navbar.component.html
+++ b/frontend/src/app/shared/components/navbar/navbar.component.html
@@ -6,21 +6,16 @@
           <span>Trustworthy Casino</span>
         </a>
         <div class="hidden md:flex items-center space-x-1">
-          <a routerLink="/home" class="nav-link">Spiele</a>
+          <a routerLink="/games" class="nav-link">Spiele</a>
         </div>
       </div>
 
       <div class="hidden md:flex items-center space-x-4">
         @if (!isLoggedIn) {
-          <button (click)="login()" class="button-primary px-4 py-1.5">Anmelden</button>
+          <button (click)="login()" class="button-base px-4 py-1.5">Anmelden</button>
         }
         @if (isLoggedIn) {
-          <div
-            class="text-white font-bold bg-deep-blue-contrast rounded-full px-4 py-2 text-sm hover:bg-deep-blue-contrast/80 hover:cursor-pointer hover:scale-105 transition-all active:scale-95 select-none duration-300"
-          >
-            <span>Balance: {{ balance() | currency: 'EUR' : 'symbol' : '1.2-2' }}</span>
-          </div>
-          <button (click)="logout()" class="button-primary px-4 py-1.5">Abmelden</button>
+          <button (click)="logout()" class="button-base px-4 py-1.5">Abmelden</button>
         }
       </div>
 
@@ -63,10 +58,10 @@
         <a routerLink="/games" class="nav-mobile-link">Spiele</a>
         <div class="pt-2 space-y-2">
           @if (!isLoggedIn) {
-            <button (click)="login()" class="button-primary w-full py-1.5">Anmelden</button>
+            <button (click)="login()" class="button-base w-full py-1.5">Anmelden</button>
           }
           @if (isLoggedIn) {
-            <button (click)="logout()" class="button-primary w-full py-1.5">Abmelden</button>
+            <button (click)="logout()" class="button-base w-full py-1.5">Abmelden</button>
           }
         </div>
       </div>
diff --git a/frontend/src/app/shared/components/navbar/navbar.component.ts b/frontend/src/app/shared/components/navbar/navbar.component.ts
index a6bbc15..53d1dee 100644
--- a/frontend/src/app/shared/components/navbar/navbar.component.ts
+++ b/frontend/src/app/shared/components/navbar/navbar.component.ts
@@ -1,32 +1,20 @@
-import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { KeycloakService } from 'keycloak-angular';
-import { UserService } from '../../../service/user.service';
 
-import { CurrencyPipe } from '@angular/common';
 @Component({
   selector: 'app-navbar',
   templateUrl: './navbar.component.html',
   standalone: true,
-  imports: [RouterModule, CurrencyPipe],
+  imports: [RouterModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class NavbarComponent implements OnInit {
+export class NavbarComponent {
   isMenuOpen = false;
   private keycloakService: KeycloakService = inject(KeycloakService);
+
   isLoggedIn = this.keycloakService.isLoggedIn();
 
-  private userService = inject(UserService);
-  private user = this.userService.getCurrentUser();
-
-  public balance = signal(0);
-
-  ngOnInit() {
-    this.user.subscribe((user) => {
-      this.balance.set(user?.balance ?? 0);
-    });
-  }
-
   login() {
     try {
       const baseUrl = window.location.origin;
diff --git a/frontend/src/app/shared/services/modal-animation.service.ts b/frontend/src/app/shared/services/modal-animation.service.ts
deleted file mode 100644
index f54c2bc..0000000
--- a/frontend/src/app/shared/services/modal-animation.service.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Injectable } from '@angular/core';
-import gsap from 'gsap';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ModalAnimationService {
-  private readonly defaultDuration = 0.3;
-  private readonly defaultEase = 'power2.out';
-
-  openModal(modalElement: HTMLElement, overlayElement: HTMLElement) {
-    gsap.set(overlayElement, { opacity: 0, display: 'block' });
-    gsap.set(modalElement, {
-      opacity: 0,
-      scale: 0.95,
-      y: 20,
-      display: 'block',
-    });
-
-    gsap.to(overlayElement, {
-      opacity: 1,
-      duration: this.defaultDuration,
-      ease: this.defaultEase,
-    });
-
-    gsap.to(modalElement, {
-      opacity: 1,
-      scale: 1,
-      y: 0,
-      duration: this.defaultDuration,
-      ease: this.defaultEase,
-    });
-  }
-
-  closeModal(modalElement: HTMLElement, overlayElement: HTMLElement, onComplete?: () => void) {
-    gsap.to([overlayElement, modalElement], {
-      opacity: 0,
-      duration: this.defaultDuration,
-      ease: this.defaultEase,
-      onComplete: () => {
-        gsap.set([overlayElement, modalElement], { display: 'none' });
-        onComplete?.();
-      },
-    });
-
-    gsap.to(modalElement, {
-      scale: 0.95,
-      y: 20,
-      duration: this.defaultDuration,
-      ease: this.defaultEase,
-    });
-  }
-}
diff --git a/frontend/src/styles.css b/frontend/src/styles.css
index 300a61a..afc40fa 100644
--- a/frontend/src/styles.css
+++ b/frontend/src/styles.css
@@ -31,14 +31,10 @@ a {
   @apply bg-deep-blue-contrast rounded-lg overflow-hidden shadow-lg hover:shadow-xl transition-shadow duration-300;
 }
 
-.button-primary {
+.button-base {
   @apply bg-emerald hover:bg-emerald-dark text-text-primary transition-all duration-300 active:scale-95 rounded;
 }
 
-.button-secondary {
-  @apply bg-deep-blue-light hover:bg-deep-blue-contrast w-full py-2 rounded my-2;
-}
-
 .game-card-content {
   @apply p-4;
 }
@@ -67,14 +63,10 @@ a {
   @apply font-bold text-text-primary;
 }
 
-.game-heading-sm {
+.game-heading {
   @apply font-bold text-text-primary text-sm mb-2;
 }
 
-.game-heading-xl {
-  @apply font-bold text-text-primary text-xl mb-2;
-}
-
 .game-text {
   @apply text-text-secondary text-sm mb-4;
 }
@@ -143,34 +135,9 @@ a {
   @apply text-xs;
 }
 
-.modal-bg {
-  @apply fixed inset-0 bg-black/80 backdrop-blur-sm z-50 focus:outline-none focus:ring-2 focus:ring-emerald-light;
-}
-
-.modal-card {
-  @apply bg-deep-blue-contrast overflow-hidden hover:shadow-xl transition-shadow duration-300 p-6 rounded-xl shadow-2xl z-50 min-w-[300px] max-w-[400px] w-full mx-auto border border-deep-blue-light/20 fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2;
-}
-
-.modal-heading {
-  @apply text-2xl font-bold text-text-primary mb-4;
-}
-
-.modal-card input {
-  @apply w-full px-4 py-2.5 bg-deep-blue-light/50 text-white rounded-lg my-1 border border-deep-blue-light/30 focus:border-emerald/50 focus:ring-1 focus:ring-emerald/50 outline-none transition-all duration-200;
-}
-
-.modal-card label {
-  @apply text-text-secondary text-sm font-medium mb-1 block;
-}
-
-.modal-card button {
-  @apply transition-all duration-200;
-}
-
-.modal-card .button-primary {
-  @apply bg-emerald hover:bg-emerald-dark text-text-primary transition-all duration-300 active:scale-95 shadow-lg shadow-emerald/20;
-}
-
-.modal-card .button-secondary {
-  @apply bg-deep-blue-light/50 hover:bg-deep-blue-light w-full py-2.5 my-2 border border-deep-blue-light/30 hover:border-deep-blue-light/50;
+.mat-mdc-dialog-container {
+  --mdc-dialog-container-color: var(--color-deep-blue-light) important;
+  --mdc-dialog-subhead-color: var(--color-text-primary) important;
+  --mdc-dialog-supporting-text-color: var(--color-text-secondary) important;
+  --mdc-dialog-container-shape: 6px important;
 }