diff --git a/src/app/components/court-selection/court-selection.component.ts b/src/app/components/court-selection/court-selection.component.ts
index 4c77074..fed2f80 100644
--- a/src/app/components/court-selection/court-selection.component.ts
+++ b/src/app/components/court-selection/court-selection.component.ts
@@ -14,7 +14,7 @@ import {MatOption, MatSelect} from "@angular/material/select";
 import {FormsModule} from "@angular/forms";
 
 @Component({
-    selector: 'app-court-selection',
+  selector: 'app-court-selection',
   imports: [
     MatDialogContent,
     MatButton,
@@ -27,8 +27,9 @@ import {FormsModule} from "@angular/forms";
     FormsModule,
 
   ],
-    templateUrl: './court-selection.component.html',
-    styleUrl: './court-selection.component.scss'
+  templateUrl: './court-selection.component.html',
+  standalone: true,
+  styleUrl: './court-selection.component.scss'
 })
 export class CourtSelectionComponent {
 
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 75731c7..46a784b 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -13,18 +13,19 @@ import {User} from "../../authentication/user";
 
 
 @Component({
-    selector: 'app-login',
-    templateUrl: './login.component.html',
-    imports: [
-        MatCardContent,
-        ReactiveFormsModule,
-        MatFormField,
-        MatButton,
-        MatInput,
-        MatLabel,
-        MatCard,
-    ],
-    styleUrls: ['./login.component.scss']
+  selector: 'app-login',
+  templateUrl: './login.component.html',
+  imports: [
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatButton,
+    MatInput,
+    MatLabel,
+    MatCard,
+  ],
+  standalone: true,
+  styleUrls: ['./login.component.scss']
 })
 export class LoginComponent implements OnInit {
   public form: FormGroup;
diff --git a/src/app/components/match-result/match-result.component.ts b/src/app/components/match-result/match-result.component.ts
index 951d394..81a0c0a 100644
--- a/src/app/components/match-result/match-result.component.ts
+++ b/src/app/components/match-result/match-result.component.ts
@@ -21,28 +21,29 @@ import {Group} from "../../model/group";
 import {Game} from "../../model/game";
 
 @Component({
-    selector: 'app-match-result',
-    imports: [
-        MatDialogContent,
-        MatDialogActions,
-        MatButton,
-        MatDialogClose,
-        MatDialogTitle,
-        TeamPipe,
-        MatInput,
-        ReactiveFormsModule,
-        FormsModule,
-        MatFormField,
-        MatGridList,
-        MatGridTile,
-        NgClass
-    ],
-    providers: [
-        FullNamePipe,
-        TeamPipe
-    ],
-    templateUrl: './match-result.component.html',
-    styleUrl: './match-result.component.scss'
+  selector: 'app-match-result',
+  imports: [
+    MatDialogContent,
+    MatDialogActions,
+    MatButton,
+    MatDialogClose,
+    MatDialogTitle,
+    TeamPipe,
+    MatInput,
+    ReactiveFormsModule,
+    FormsModule,
+    MatFormField,
+    MatGridList,
+    MatGridTile,
+    NgClass
+  ],
+  providers: [
+    FullNamePipe,
+    TeamPipe
+  ],
+  templateUrl: './match-result.component.html',
+  standalone: true,
+  styleUrl: './match-result.component.scss'
 })
 export class MatchResultComponent {
 
diff --git a/src/app/components/match-sheets/match-sheets.component.ts b/src/app/components/match-sheets/match-sheets.component.ts
index fec5211..1998491 100644
--- a/src/app/components/match-sheets/match-sheets.component.ts
+++ b/src/app/components/match-sheets/match-sheets.component.ts
@@ -13,7 +13,7 @@ import {ReactiveFormsModule} from "@angular/forms";
 import {HeaderService} from "../../service/header.service";
 
 @Component({
-    selector: 'app-match-sheets',
+  selector: 'app-match-sheets',
   imports: [
     MatCard,
     MatCardContent,
@@ -22,12 +22,13 @@ import {HeaderService} from "../../service/header.service";
     MatInput,
     ReactiveFormsModule
   ],
-    providers: [
-        TeamPipe,
-        FullNamePipe
-    ],
-    templateUrl: './match-sheets.component.html',
-    styleUrl: './match-sheets.component.scss'
+  providers: [
+    TeamPipe,
+    FullNamePipe
+  ],
+  templateUrl: './match-sheets.component.html',
+  standalone: true,
+  styleUrl: './match-sheets.component.scss'
 })
 export class MatchSheetsComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/components/player-edit/player-edit.component.ts b/src/app/components/player-edit/player-edit.component.ts
index b9d06da..d252d67 100644
--- a/src/app/components/player-edit/player-edit.component.ts
+++ b/src/app/components/player-edit/player-edit.component.ts
@@ -15,7 +15,7 @@ import {MatSnackBar} from "@angular/material/snack-bar";
 import {NgxMaskDirective} from "ngx-mask";
 
 @Component({
-    selector: 'app-player-edit',
+  selector: 'app-player-edit',
   imports: [
     FormsModule,
     RouterLink,
@@ -37,8 +37,9 @@ import {NgxMaskDirective} from "ngx-mask";
     ReactiveFormsModule,
     NgxMaskDirective
   ],
-    templateUrl: './player-edit.component.html',
-    styleUrl: './player-edit.component.scss'
+  templateUrl: './player-edit.component.html',
+  standalone: true,
+  styleUrl: './player-edit.component.scss'
 })
 export class PlayerEditComponent implements OnInit {
   player: Player;
diff --git a/src/app/components/player-link/player-link.component.ts b/src/app/components/player-link/player-link.component.ts
index ac87e6a..ad5284f 100644
--- a/src/app/components/player-link/player-link.component.ts
+++ b/src/app/components/player-link/player-link.component.ts
@@ -3,13 +3,13 @@ import {Component, Input, OnInit} from '@angular/core';
 import {RouterLink} from "@angular/router";
 
 @Component({
-    selector: 'player-link',
-    imports: [
-        // MatAnchor,
-        RouterLink
-    ],
-    templateUrl: './player-link.component.html',
-    styleUrl: './player-link.component.scss'
+  selector: 'player-link',
+  imports: [
+    RouterLink
+  ],
+  templateUrl: './player-link.component.html',
+  standalone: true,
+  styleUrl: './player-link.component.scss'
 })
 export class PlayerLinkComponent implements OnInit {
 
diff --git a/src/app/components/player-list/player-list.component.ts b/src/app/components/player-list/player-list.component.ts
index bbbe40a..d47c66b 100644
--- a/src/app/components/player-list/player-list.component.ts
+++ b/src/app/components/player-list/player-list.component.ts
@@ -25,11 +25,12 @@ import {MatPaginator} from "@angular/material/paginator";
 import {MatSort, MatSortHeader} from "@angular/material/sort";
 
 @Component({
-    selector: 'app-player-list',
+  selector: 'app-player-list',
   imports: [RouterLink, MatAnchor, MatIcon, MatCard, MatCardContent, FullNamePipe, MatTable, MatColumnDef, MatHeaderCell, MatHeaderCellDef, MatCell, MatCellDef, MatHeaderRow, MatHeaderRowDef, MatRow, MatRowDef, MatFormField, MatInput, MatFormFieldModule, MatPaginator, MatSortHeader, MatSort],
-    providers: [FullNamePipe],
-    templateUrl: './player-list.component.html',
-    styleUrl: './player-list.component.scss'
+  providers: [FullNamePipe],
+  templateUrl: './player-list.component.html',
+  standalone: true,
+  styleUrl: './player-list.component.scss'
 })
 export class PlayerListComponent implements AfterViewInit {
 
diff --git a/src/app/components/player-registrations/player-registrations.component.ts b/src/app/components/player-registrations/player-registrations.component.ts
index e3b7fdf..28071f8 100644
--- a/src/app/components/player-registrations/player-registrations.component.ts
+++ b/src/app/components/player-registrations/player-registrations.component.ts
@@ -17,7 +17,7 @@ import {FullNamePipe} from "../../pipes/fullname-pipe";
 import {HeaderService} from "../../service/header.service";
 
 @Component({
-    selector: 'app-player-registrations',
+  selector: 'app-player-registrations',
   imports: [
     MatCard,
     MatCardContent,
@@ -36,11 +36,12 @@ import {HeaderService} from "../../service/header.service";
     MatAnchor,
     FullNamePipe
   ],
-    providers: [
-        FullNamePipe
-    ],
-    templateUrl: './player-registrations.component.html',
-    styleUrl: './player-registrations.component.scss'
+  providers: [
+    FullNamePipe
+  ],
+  templateUrl: './player-registrations.component.html',
+  standalone: true,
+  styleUrl: './player-registrations.component.scss'
 })
 export class PlayerRegistrationsComponent implements OnInit {
 
diff --git a/src/app/components/round-overview/round-overview.component.ts b/src/app/components/round-overview/round-overview.component.ts
index 105bb45..d67ce68 100644
--- a/src/app/components/round-overview/round-overview.component.ts
+++ b/src/app/components/round-overview/round-overview.component.ts
@@ -10,18 +10,19 @@ import {TeamPipe} from "../../pipes/team-pipe";
 import {FullNamePipe} from "../../pipes/fullname-pipe";
 
 @Component({
-    selector: 'app-round-overview',
+  selector: 'app-round-overview',
   imports: [
     TeamPipe,
     DecimalPipe,
     FullNamePipe
   ],
-    providers: [
-        TeamPipe,
-        FullNamePipe
-    ],
-    templateUrl: './round-overview.component.html',
-    styleUrl: './round-overview.component.scss'
+  providers: [
+    TeamPipe,
+    FullNamePipe
+  ],
+  templateUrl: './round-overview.component.html',
+  standalone: true,
+  styleUrl: './round-overview.component.scss'
 })
 export class RoundOverviewComponent implements OnInit {
 
diff --git a/src/app/components/tournament-draw/tournament-draw.component.ts b/src/app/components/tournament-draw/tournament-draw.component.ts
index 0f937fe..07f2e5c 100644
--- a/src/app/components/tournament-draw/tournament-draw.component.ts
+++ b/src/app/components/tournament-draw/tournament-draw.component.ts
@@ -14,7 +14,7 @@ import {TeamPipe} from "../../pipes/team-pipe";
 import {FullNamePipe} from "../../pipes/fullname-pipe";
 
 @Component({
-    selector: 'app-tournament-draw',
+  selector: 'app-tournament-draw',
   imports: [
     MatCard,
     MatCardContent,
@@ -25,12 +25,13 @@ import {FullNamePipe} from "../../pipes/fullname-pipe";
     TeamPipe,
     MatAccordion
   ],
-    providers: [
-        FullNamePipe,
-        TeamPipe
-    ],
-    templateUrl: './tournament-draw.component.html',
-    styleUrl: './tournament-draw.component.scss'
+  providers: [
+    FullNamePipe,
+    TeamPipe
+  ],
+  templateUrl: './tournament-draw.component.html',
+  standalone: true,
+  styleUrl: './tournament-draw.component.scss'
 })
 export class TournamentDrawComponent implements OnInit {
 
diff --git a/src/app/components/tournament-edit/tournament-edit.component.ts b/src/app/components/tournament-edit/tournament-edit.component.ts
index 08114cb..e6145ba 100644
--- a/src/app/components/tournament-edit/tournament-edit.component.ts
+++ b/src/app/components/tournament-edit/tournament-edit.component.ts
@@ -18,7 +18,7 @@ import {MatCheckbox} from "@angular/material/checkbox";
 registerLocaleData(nl);
 
 @Component({
-    selector: 'app-tournament-edit',
+  selector: 'app-tournament-edit',
   imports: [
     FormsModule,
     RouterLink,
@@ -37,11 +37,12 @@ registerLocaleData(nl);
     NgxMaskDirective,
     MatCheckbox
   ],
-    providers: [
-        CurrencyPipe
-    ],
-    templateUrl: './tournament-edit.component.html',
-    styleUrl: './tournament-edit.component.scss'
+  providers: [
+    CurrencyPipe
+  ],
+  templateUrl: './tournament-edit.component.html',
+  standalone: true,
+  styleUrl: './tournament-edit.component.scss'
 })
 export class TournamentEditComponent implements OnInit {
 
diff --git a/src/app/components/tournament-list/tournament-list.component.ts b/src/app/components/tournament-list/tournament-list.component.ts
index 88cb4df..dd0856c 100644
--- a/src/app/components/tournament-list/tournament-list.component.ts
+++ b/src/app/components/tournament-list/tournament-list.component.ts
@@ -9,12 +9,13 @@ import {MatTableModule} from "@angular/material/table";
 import {HeaderService} from "../../service/header.service";
 
 @Component({
-    selector: 'app-tournament-list',
+  selector: 'app-tournament-list',
   imports: [
     RouterLink, MatAnchor, MatIcon, MatCard, MatCardContent, MatButton, MatTableModule
   ],
-    templateUrl: './tournament-list.component.html',
-    styleUrl: './tournament-list.component.scss'
+  templateUrl: './tournament-list.component.html',
+  standalone: true,
+  styleUrl: './tournament-list.component.scss'
 })
 export class TournamentListComponent implements OnInit {
 
diff --git a/src/app/components/tournament-manage/tournament-manage.component.scss b/src/app/components/tournament-manage/tournament-manage.component.scss
index ce8044f..46841ba 100644
--- a/src/app/components/tournament-manage/tournament-manage.component.scss
+++ b/src/app/components/tournament-manage/tournament-manage.component.scss
@@ -1,6 +1,7 @@
 td {
   vertical-align: middle;
 }
+
 td, th {
   background-color: transparent !important;
 }
@@ -8,6 +9,7 @@ td, th {
 table.wide td, table.wide th {
   height: 4em;
 }
+
 .winner {
   color: green;
   font-weight: bold;
@@ -33,6 +35,7 @@ td.w-fill {
   width: 95% !important;
 }
 
-.material-tooltip {
-  white-space: pre-line;
+
+.mat-menu-panel {
+  z-index: 1000 !important;
 }
diff --git a/src/app/components/tournament-manage/tournament-manage.component.ts b/src/app/components/tournament-manage/tournament-manage.component.ts
index 5fc4d74..65e1fc4 100644
--- a/src/app/components/tournament-manage/tournament-manage.component.ts
+++ b/src/app/components/tournament-manage/tournament-manage.component.ts
@@ -36,7 +36,7 @@ import {TournamentPlayer} from "../../model/tournamentPlayer";
 import {MatTooltip} from "@angular/material/tooltip";
 
 @Component({
-    selector: 'app-tournament-manage',
+  selector: 'app-tournament-manage',
   imports: [
     FullNamePipe,
     MatAccordion,
@@ -64,13 +64,14 @@ import {MatTooltip} from "@angular/material/tooltip";
     TournamentPlayersComponent,
     MatExpansionPanelActionRow,
   ],
-    providers: [
-        FullNamePipe,
-        TeamPipe,
-        MatchResultPipe
-    ],
-    templateUrl: './tournament-manage.component.html',
-    styleUrl: './tournament-manage.component.scss'
+  providers: [
+    FullNamePipe,
+    TeamPipe,
+    MatchResultPipe
+  ],
+  templateUrl: './tournament-manage.component.html',
+  standalone: true,
+  styleUrl: './tournament-manage.component.scss'
 })
 export class TournamentManageComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/components/tournament-players/tournament-players.component.ts b/src/app/components/tournament-players/tournament-players.component.ts
index 0bbf561..2360c9f 100644
--- a/src/app/components/tournament-players/tournament-players.component.ts
+++ b/src/app/components/tournament-players/tournament-players.component.ts
@@ -15,6 +15,7 @@ import {MatSnackBar} from "@angular/material/snack-bar";
     FormsModule
   ],
   templateUrl: './tournament-players.component.html',
+  standalone: true,
   styleUrl: './tournament-players.component.scss'
 })
 export class TournamentPlayersComponent implements OnInit {
diff --git a/src/app/components/tournament-registrations/tournament-registrations.component.ts b/src/app/components/tournament-registrations/tournament-registrations.component.ts
index 427b51d..6957b8a 100644
--- a/src/app/components/tournament-registrations/tournament-registrations.component.ts
+++ b/src/app/components/tournament-registrations/tournament-registrations.component.ts
@@ -7,15 +7,16 @@ import {Event} from "../../model/event";
 import {FullNamePipe} from "../../pipes/fullname-pipe";
 
 @Component({
-    selector: 'app-tournament-registrations',
-    imports: [
-        MatCard,
-        MatCardHeader,
-        MatCardContent,
-        FullNamePipe
-    ],
-    templateUrl: './tournament-registrations.component.html',
-    styleUrl: './tournament-registrations.component.scss'
+  selector: 'app-tournament-registrations',
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardContent,
+    FullNamePipe
+  ],
+  templateUrl: './tournament-registrations.component.html',
+  standalone: true,
+  styleUrl: './tournament-registrations.component.scss'
 })
 export class TournamentRegistrationsComponent implements OnInit {
 
diff --git a/src/app/components/tournament-validate/tournament-validate.component.ts b/src/app/components/tournament-validate/tournament-validate.component.ts
index 17d32cf..8d743a3 100644
--- a/src/app/components/tournament-validate/tournament-validate.component.ts
+++ b/src/app/components/tournament-validate/tournament-validate.component.ts
@@ -18,21 +18,22 @@ import {PlayerService} from "../../service/player.service";
 import {PlayerLinkComponent} from "../player-link/player-link.component";
 
 @Component({
-    selector: 'app-tournament-validate',
-    imports: [
-        MatCard,
-        MatCardHeader,
-        MatCardContent,
-        MatExpansionPanel,
-        MatExpansionPanelTitle,
-        MatExpansionPanelHeader,
-        MatAccordion,
-        MatIcon,
-        FullNamePipe,
-        PlayerLinkComponent
-    ],
-    templateUrl: './tournament-validate.component.html',
-    styleUrl: './tournament-validate.component.scss'
+  selector: 'app-tournament-validate',
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardContent,
+    MatExpansionPanel,
+    MatExpansionPanelTitle,
+    MatExpansionPanelHeader,
+    MatAccordion,
+    MatIcon,
+    FullNamePipe,
+    PlayerLinkComponent
+  ],
+  templateUrl: './tournament-validate.component.html',
+  standalone: true,
+  styleUrl: './tournament-validate.component.scss'
 })
 export class TournamentValidateComponent implements OnInit {
   tournament: Tournament;