diff --git a/src/app/footer/footer.component.css b/src/app/footer/footer.component.css
index a62fa5a..ba194de 100644
--- a/src/app/footer/footer.component.css
+++ b/src/app/footer/footer.component.css
@@ -20,18 +20,22 @@
     padding: 20px 0;
 }
 
-.footer-links a {
-    color: #ffffff;
-    font-size: 18px;
-    margin: 0 10px;
-}
-
 .footer-btn {
     color: #ffffff;
     font-size: 18px;
     border: 1px solid #ffffff;
     border-radius: 50%;
-    margin: 0 5px;
+    margin: 0 10px;
+
+    width: 42px;
+    height: 42px;
+}
+
+.footer-btn a {
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    align-items: center;
 }
 
 .footer-btn:hover {
diff --git a/src/app/header/header.component.css b/src/app/header/header.component.css
index 89de955..fe21636 100644
--- a/src/app/header/header.component.css
+++ b/src/app/header/header.component.css
@@ -1,12 +1,22 @@
+.wrapper {
+    width: 100vw;
+    overflow: hidden;
+}
+
 .header {
     top: 0;
     left: 0;
     display: flex;
     position: fixed;
-    width: 100%;
+    width: 100vw;
+
     background-color: #2e2e2e;
+
     height: 10vh;
     min-height: 80px;
+
+    justify-content: center;
+    align-items: center;
 }
 
 .header-spacer {
@@ -100,6 +110,10 @@ app-header-slider {
 /* ====================== COMPUTER MEDIA FORMAT ======================== */
 
 @media only screen and (min-width: 712px) {
+    .main {
+        max-width: 1333px;
+    }
+
     .nav-links {
         all: unset;
         width: 50%;
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 3a00597..06dbcda 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,60 +1,63 @@
-<div class="header">
-    <div class="main" #header>
-        <div class="logo">
-            <a routerLink="">
-                <img src="assets/img/logohideyoshi-white.png" alt="" />
-            </a>
-        </div>
-        <div class="nav-links">
-            <ul class="link-container">
-                <li *ngFor="let page of pages">
-                    <a [routerLink]="page.route">{{ page.name }}</a>
-                </li>
-            </ul>
-        </div>
-
-        <div class="profile" #profileDropdown>
-            <div
-                class="profile-btn"
-                (click)="toogleProfileDropdown()"
-                #profileBtn
-            >
-                <fa-icon
-                    *ngIf="!loggedUser || !loggedUser.profilePictureUrl"
-                    class="fas fa-user"
-                    [icon]="userIcon"
-                ></fa-icon>
-                <img
-                    *ngIf="!!loggedUser && !!loggedUser.profilePictureUrl"
-                    class="profile-picture"
-                    [ngSrc]="loggedUser.profilePictureUrl"
-                    width="50"
-                    height="50"
-                    alt="Profile Picture"
-                    priority
-                />
+<div class="wrapper">
+    <div class="header">
+        <div class="main" #header>
+            <div class="logo">
+                <a routerLink="">
+                    <img src="assets/img/logohideyoshi-white.png" alt="" />
+                </a>
+            </div>
+            <div class="nav-links">
+                <ul class="link-container">
+                    <li *ngFor="let page of pages">
+                        <a [routerLink]="page.route">{{ page.name }}</a>
+                    </li>
+                </ul>
             </div>
 
-            <app-header-dropdown
-                class="dropdown"
-                (clickOutside)="closeDropdown()"
-                [ignoreClickOutside]="[profileBtn]"
-                [state]="profileDropdownState"
-                (loginPopupState)="loginPopupStateChange($event)"
-                (signupPopupState)="signupPopupStateChange($event)"
-                (myProfilePopupState)="myProfilePopupStateChange($event)"
-                (helpPopupState)="helpPopupStateChange($event)"
-            >
-            </app-header-dropdown>
-        </div>
-        <div class="burger-container" (click)="toogleNavSlider()">
-            <div
-                class="burger-menu"
-                [ngClass]="{ open: navSliderStatus }"
-            ></div>
+            <div class="profile" #profileDropdown>
+                <div
+                    class="profile-btn"
+                    (click)="toogleProfileDropdown()"
+                    #profileBtn
+                >
+                    <fa-icon
+                        *ngIf="!loggedUser || !loggedUser.profilePictureUrl"
+                        class="fas fa-user"
+                        [icon]="userIcon"
+                    ></fa-icon>
+                    <img
+                        *ngIf="!!loggedUser && !!loggedUser.profilePictureUrl"
+                        class="profile-picture"
+                        [ngSrc]="loggedUser.profilePictureUrl"
+                        width="50"
+                        height="50"
+                        alt="Profile Picture"
+                        priority
+                    />
+                </div>
+
+                <app-header-dropdown
+                    class="dropdown"
+                    (clickOutside)="closeDropdown()"
+                    [ignoreClickOutside]="[profileBtn]"
+                    [state]="profileDropdownState"
+                    (loginPopupState)="loginPopupStateChange($event)"
+                    (signupPopupState)="signupPopupStateChange($event)"
+                    (myProfilePopupState)="myProfilePopupStateChange($event)"
+                    (helpPopupState)="helpPopupStateChange($event)"
+                >
+                </app-header-dropdown>
+            </div>
+            <div class="burger-container" (click)="toogleNavSlider()">
+                <div
+                    class="burger-menu"
+                    [ngClass]="{ open: navSliderStatus }"
+                ></div>
+            </div>
         </div>
     </div>
-    <div #nav>
+
+    <div class="slider-container" #nav>
         <app-header-slider
             [(state)]="navSliderStatus"
             [clickOutsideStopWatching]="userSliderStatus"
@@ -69,7 +72,7 @@
         </app-header-slider>
     </div>
 
-    <div #user>
+    <div class="slider-container" #user>
         <app-header-slider
             [(state)]="userSliderStatus"
             [ignoreClickOutside]="[header, nav]"
@@ -85,4 +88,5 @@
         </app-header-slider>
     </div>
 </div>
+
 <div class="header-spacer"></div>
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 734ff54..d3c6a31 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -33,8 +33,6 @@ export class HeaderComponent implements OnInit, OnDestroy {
 
     profileDropdownState: boolean = false;
 
-    signupPopupState: boolean = false;
-
     navSliderStatus: boolean = false;
 
     userSliderStatus: boolean = false;