diff --git a/frontend/package.json b/frontend/package.json
index 9ca3a38..67ac0f6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,7 +18,7 @@
     "@angular/compiler": "^19.2.0",
     "@angular/core": "^19.2.0",
     "@angular/forms": "^19.2.0",
-    "@angular/material": "^19.2.18",
+    "@angular/material": "^19.2.19",
     "@angular/platform-browser": "^19.2.0",
     "@angular/platform-browser-dynamic": "^19.2.0",
     "@angular/router": "^19.2.0",
diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts
index 0608afd..77c504e 100644
--- a/frontend/src/app/app.routes.ts
+++ b/frontend/src/app/app.routes.ts
@@ -108,5 +108,17 @@ export const routes: Routes = [
   {
     path: 'forms',
     loadComponent: () => import('./pages/forms/forms.component').then(m => m.FormsComponent)
-  }
+  },
+  {
+    path: 'community',
+    loadComponent: () => import('./pages/altitude/community/community.component').then(m => m.CommunityComponent)
+  },
+  {
+    path: 'nicknames',
+    loadComponent: () => import('./pages/reference/nicknames/nicknames.component').then(m => m.NicknamesComponent)
+  },
+  {
+    path: 'nickgenerator',
+    loadComponent: () => import('./pages/reference/nickgenerator/nickgenerator.component').then(m => m.NickgeneratorComponent)
+  },
 ];
diff --git a/frontend/src/app/community/community.component.html b/frontend/src/app/pages/altitude/community/community.component.html
similarity index 100%
rename from frontend/src/app/community/community.component.html
rename to frontend/src/app/pages/altitude/community/community.component.html
diff --git a/frontend/src/app/community/community.component.scss b/frontend/src/app/pages/altitude/community/community.component.scss
similarity index 100%
rename from frontend/src/app/community/community.component.scss
rename to frontend/src/app/pages/altitude/community/community.component.scss
diff --git a/frontend/src/app/community/community.component.spec.ts b/frontend/src/app/pages/altitude/community/community.component.spec.ts
similarity index 100%
rename from frontend/src/app/community/community.component.spec.ts
rename to frontend/src/app/pages/altitude/community/community.component.spec.ts
diff --git a/frontend/src/app/community/community.component.ts b/frontend/src/app/pages/altitude/community/community.component.ts
similarity index 80%
rename from frontend/src/app/community/community.component.ts
rename to frontend/src/app/pages/altitude/community/community.component.ts
index e8964bc..7a067cd 100644
--- a/frontend/src/app/community/community.component.ts
+++ b/frontend/src/app/pages/altitude/community/community.component.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {HeaderComponent} from "../header/header.component";
+import {HeaderComponent} from "@header/header.component";
 
 @Component({
   selector: 'app-community',
diff --git a/frontend/src/app/pages/header/header/header.component.html b/frontend/src/app/pages/header/header/header.component.html
index 6cc8e61..c93f887 100644
--- a/frontend/src/app/pages/header/header/header.component.html
+++ b/frontend/src/app/pages/header/header/header.component.html
@@ -62,12 +62,17 @@
                   <li><a href="https://alttd.com/blog/">Blog</a></li>
                 </ul>
               </li>
+              <li *ngIf="!isAuthenticated">
+                <a (click)="openLoginDialog()">
+                  Login
+                </a>
+              </li>
             </ul>
           </div>
         </div>
         <a href="/"><img ngSrc="/public/img/logos/logo.png" priority alt="Altitude Server Logo" height="319"
                          width="550"></a>
-        <ul>
+        <ul id="nav_list">
           <li class="nav_li"><a [id]="getCurrentPageId(['home'])" class="nav_link" href="/" [ngClass]="active">Home</a>
           </li>
           <li class="nav_li">
@@ -137,12 +142,13 @@
               <li class="nav_li"><a class="nav_link2" [routerLink]="['/particles']">Particles</a></li>
             </ul>
           </li>
+          <li class="nav_li login-button" *ngIf="!isAuthenticated">
+            <a class="nav_link fake_link" (click)="openLoginDialog()">
+              Login
+            </a>
+          </li>
         </ul>
-        <ng-container *ngIf="!isAuthenticated">
-          <button mat-button (click)="openLoginDialog()" style="color: white">
-            Login
-          </button>
-        </ng-container>
+
         <app-theme></app-theme>
       </div>
     </nav>
diff --git a/frontend/src/app/pages/header/header/header.component.scss b/frontend/src/app/pages/header/header/header.component.scss
index 9fdaaa1..7f59b11 100644
--- a/frontend/src/app/pages/header/header/header.component.scss
+++ b/frontend/src/app/pages/header/header/header.component.scss
@@ -259,6 +259,10 @@ nav img {
   display: none;
 }
 
+.login-button {
+  margin-left: 40px;
+}
+
 @-moz-document url-prefix() {
   .dropdown2 {
     top: 12px;
@@ -271,12 +275,6 @@ nav img {
   }
 }
 
-@media (max-width: 1000px) {
-  #scroll-button {
-    padding-top: 5px;
-  }
-}
-
 @media (max-width: 1150px) {
   .dropdown {
     top: -10px;
@@ -305,10 +303,6 @@ nav img {
     display: block;
     width: 100%;
   }
-
-  .switch-div {
-    top: 65px;
-  }
 }
 
 @media (max-width: 690px) {
@@ -340,10 +334,6 @@ nav img {
     background: none;
     border-bottom: 3px solid var(--pureblack);
   }
-
-  .switch-div {
-    top: 33px;
-  }
 }
 
 @media (min-width: 690px) {
diff --git a/frontend/src/app/pages/home/home.component.scss b/frontend/src/app/pages/home/home.component.scss
index 316673c..17525dd 100644
--- a/frontend/src/app/pages/home/home.component.scss
+++ b/frontend/src/app/pages/home/home.component.scss
@@ -322,6 +322,7 @@ main .container {
 
   #header-img {
     width: 65%;
+    height: 18%;
   }
 
   .title {
diff --git a/frontend/src/app/nickgenerator/nickgenerator.component.html b/frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.html
similarity index 100%
rename from frontend/src/app/nickgenerator/nickgenerator.component.html
rename to frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.html
diff --git a/frontend/src/app/nickgenerator/nickgenerator.component.scss b/frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.scss
similarity index 100%
rename from frontend/src/app/nickgenerator/nickgenerator.component.scss
rename to frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.scss
diff --git a/frontend/src/app/nickgenerator/nickgenerator.component.spec.ts b/frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.spec.ts
similarity index 100%
rename from frontend/src/app/nickgenerator/nickgenerator.component.spec.ts
rename to frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.spec.ts
diff --git a/frontend/src/app/nickgenerator/nickgenerator.component.ts b/frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.ts
similarity index 81%
rename from frontend/src/app/nickgenerator/nickgenerator.component.ts
rename to frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.ts
index 65c8922..0eedf36 100644
--- a/frontend/src/app/nickgenerator/nickgenerator.component.ts
+++ b/frontend/src/app/pages/reference/nickgenerator/nickgenerator.component.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {HeaderComponent} from "../header/header.component";
+import {HeaderComponent} from "@header/header.component";
 
 @Component({
   selector: 'app-nickgenerator',
diff --git a/frontend/src/app/nicknames/nicknames.component.html b/frontend/src/app/pages/reference/nicknames/nicknames.component.html
similarity index 97%
rename from frontend/src/app/nicknames/nicknames.component.html
rename to frontend/src/app/pages/reference/nicknames/nicknames.component.html
index c5a3759..2001a12 100644
--- a/frontend/src/app/nicknames/nicknames.component.html
+++ b/frontend/src/app/pages/reference/nicknames/nicknames.component.html
@@ -29,7 +29,7 @@
               color options. These colors will be in the form of <span
                 style="font-family: 'opensans-bold', sans-serif;">#XXXXXX</span>; write down the colors that you like so
               that you can easily use them later.</p>
-            <img ngSrc="/public/img/random/colors.png" alt="RGB colors" style="width: 100%; padding:0;" height="130"
+            <img ngSrc="/img/random/colors.png" alt="RGB colors" style="width: 100%; padding:0;" height="130"
                  width="480">
             <p>Output of /colorsextra</p>
             <p>Furthermore, you can also use the <a [routerLink]="['/nickgenerator']">nickname generation tool</a> to
diff --git a/frontend/src/app/nicknames/nicknames.component.scss b/frontend/src/app/pages/reference/nicknames/nicknames.component.scss
similarity index 100%
rename from frontend/src/app/nicknames/nicknames.component.scss
rename to frontend/src/app/pages/reference/nicknames/nicknames.component.scss
diff --git a/frontend/src/app/nicknames/nicknames.component.spec.ts b/frontend/src/app/pages/reference/nicknames/nicknames.component.spec.ts
similarity index 100%
rename from frontend/src/app/nicknames/nicknames.component.spec.ts
rename to frontend/src/app/pages/reference/nicknames/nicknames.component.spec.ts
diff --git a/frontend/src/app/nicknames/nicknames.component.ts b/frontend/src/app/pages/reference/nicknames/nicknames.component.ts
similarity index 86%
rename from frontend/src/app/nicknames/nicknames.component.ts
rename to frontend/src/app/pages/reference/nicknames/nicknames.component.ts
index 6950a6e..654d96b 100644
--- a/frontend/src/app/nicknames/nicknames.component.ts
+++ b/frontend/src/app/pages/reference/nicknames/nicknames.component.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {HeaderComponent} from "../header/header.component";
+import {HeaderComponent} from "@header/header.component";
 import {NgOptimizedImage} from '@angular/common';
 import {RouterLink} from '@angular/router';
 
diff --git a/frontend/src/app/shared-components/theme/theme.component.html b/frontend/src/app/shared-components/theme/theme.component.html
index 8ae21cf..31aa74d 100644
--- a/frontend/src/app/shared-components/theme/theme.component.html
+++ b/frontend/src/app/shared-components/theme/theme.component.html
@@ -1,4 +1,4 @@
-<div class="switch-div" style="z-index: 1;">
+<div class="switch-div">
   <label class="switch">
     <input type="checkbox" [checked]="isDarkMode" (change)="toggleTheme()" id="slider">
     <span class="slider round"></span>
diff --git a/frontend/src/app/shared-components/theme/theme.component.scss b/frontend/src/app/shared-components/theme/theme.component.scss
index cbc3668..e8e02c7 100644
--- a/frontend/src/app/shared-components/theme/theme.component.scss
+++ b/frontend/src/app/shared-components/theme/theme.component.scss
@@ -7,7 +7,9 @@
 }
 
 .switch-div {
+  position: absolute;
   right: 40px;
+  z-index: 1;
 }
 
 /* Hide default HTML checkbox */
@@ -72,3 +74,16 @@ input:checked + .slider:before {
 .slider.round:before {
   border-radius: 50%;
 }
+
+@media (max-width: 1150px) {
+  .switch-div {
+    top: 65px;
+  }
+}
+
+@media (max-width: 690px) {
+  .switch-div {
+    top: 33px;
+    margin-right: 25px;
+  }
+}