diff --git a/src/app/modules/contact/components/contact/contact.component.html b/src/app/modules/contact/components/contact/contact.component.html
index 22d7f0e..018408c 100644
--- a/src/app/modules/contact/components/contact/contact.component.html
+++ b/src/app/modules/contact/components/contact/contact.component.html
@@ -1,77 +1,127 @@
-  <!-- <h1 class="text-center light-text">
-    Contact
-    <span>
-      <mat-icon>mail</mat-icon>
-    </span>
-  </h1>
-
-  <form [formGroup]="contactForm">
-    <div class="row">
-      <div class="col col-lg-6 offset-col-lg-3">
-
-
-
-
-
+<!-- <div class="container my-5 mx-5">
+  <mat-toolbar>
+    <h1 class="light-text text-center">Contact</h1>
+  </mat-toolbar>
+  <div class="row">
+    <p class="light-text text-center"> Do you have any questions? Please do not hesitate to contact us directly. Our
+      team will come
+      back to you within a
+      matter of hours to help you.
+    </p>
+    <form [formGroup]="contactForm">
+      <div class="col">
+        <div class="mx-5 my-5">
+          <mat-form-field>
+            <input matInput formControlName="name" placeholder="Enter your name..." />
+            <span *ngIf="!contactForm.get('name').valid && contactForm.get('name').touched">Name field is
+              required.</span>
+          </mat-form-field>
+        </div>
       </div>
-    </div>
-
-    <div class="mx-5 my-5">
-      <mat-form-field>
-        <input matInput formControlName="subject" placeholder="Enter your subject..." />
-      </mat-form-field>
-    </div>
-
-
-
-
-
-  </form> -->
+      <div class="col">
+        <div class="mx-5 my-5">
+          <mat-form-field>
+            <input matInput formControlName="email" placeholder="Enter your email..." />
+            <span *ngIf="!contactForm.get('email').valid && contactForm.get('email').touched">Email field is
+              required.</span>
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="w-100"></div>
+      <div class="col">
+        <div class="mx-5 my-5">
+          <mat-form-field>
+            <input matInput formControlName="subject" placeholder="Enter your subject..." />
+            <span *ngIf="!contactForm.get('subject').valid && contactForm.get('subject').touched">Subject field is
+              required.</span>
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="col">
+        <div class="mx-5 my-5">
+          <mat-form-field>
+            <textarea matInput formControlName="body" placeholder="Message body..."></textarea>
+            <span *ngIf="!contactForm.get('body').valid && contactForm.get('body').touched">Body field is
+              required.</span>
+          </mat-form-field>
+        </div>
+        <button mat-raised-button color="primary" type="button" (click)="onSubmitContactForm();">Submit</button>
+      </div>
+    </form>
+  </div>
+</div>
+ -->
 
-  <div class="container">
+<section class="container my-5 mx-5">
+  <div class="row">
     <mat-toolbar>
       <h1 class="light-text text-center">Contact</h1>
     </mat-toolbar>
-    <div class="row">
+    <!--Grid column-->
+    <div class="col-lg-12">
       <form [formGroup]="contactForm">
-        <div class="col">
-          <div class="mx-5 my-5">
-            <mat-form-field>
-              <input matInput formControlName="name" placeholder="Enter your name..." />
-              <span *ngIf="!contactForm.get('name').valid && contactForm.get('name').touched">Name field is
-                required.</span>
-            </mat-form-field>
+
+        <!--Grid row-->
+        <div class="row">
+
+          <!--Grid column-->
+          <div class="col">
+            <div class="mx-5 my-5">
+              <mat-form-field>
+                <input matInput formControlName="name" placeholder="Enter your name..." />
+                <span *ngIf="!contactForm.get('name').valid && contactForm.get('name').touched">Name field is
+                  required.</span>
+              </mat-form-field>
+            </div>
           </div>
-        </div>
-        <div class="col">
-          <div class="mx-5 my-5">
-            <mat-form-field>
-              <input matInput formControlName="email" placeholder="Enter your email..." />
-              <span *ngIf="!contactForm.get('email').valid && contactForm.get('email').touched">Email field is
-                required.</span>
-            </mat-form-field>
+          <!--Grid column-->
+
+          <!--Grid column-->
+          <div class="col-md-6">
+            <div class="col">
+              <div class="mx-5 my-5">
+                <mat-form-field>
+                  <input matInput formControlName="email" placeholder="Enter your email..." />
+                  <span *ngIf="!contactForm.get('email').valid && contactForm.get('email').touched">Email field is
+                    required.</span>
+                </mat-form-field>
+              </div>
+            </div>
           </div>
+          <!--Grid column-->
+
         </div>
-        <div class="w-100"></div>
-        <div class="col">
-          <div class="mx-5 my-5">
-            <mat-form-field>
-              <input matInput formControlName="subject" placeholder="Enter your subject..." />
-              <span *ngIf="!contactForm.get('subject').valid && contactForm.get('subject').touched">Subject field is
-                required.</span>
-            </mat-form-field>
+        <!--Grid row-->
+
+        <!--Grid row-->
+        <div class="row">
+
+          <div class="col">
+            <div class="mx-5 my-5">
+              <mat-form-field>
+                <input matInput formControlName="subject" placeholder="Enter your subject..." />
+                <span *ngIf="!contactForm.get('subject').valid && contactForm.get('subject').touched">Subject field is
+                  required.</span>
+              </mat-form-field>
+            </div>
           </div>
-        </div>
-        <div class="col">
-          <div class="mx-5 my-5">
-            <mat-form-field>
-              <textarea matInput formControlName="body" placeholder="Message body..."></textarea>
-              <span *ngIf="!contactForm.get('body').valid && contactForm.get('body').touched">Body field is
-                required.</span>
-            </mat-form-field>
+
+          <div class="col-md-6">
+
+            <div class="col">
+              <div class="mx-5 my-5">
+                <mat-form-field>
+                  <textarea matInput formControlName="body" placeholder="Message body..."></textarea>
+                  <span *ngIf="!contactForm.get('body').valid && contactForm.get('body').touched">Body field is
+                    required.</span>
+                </mat-form-field>
+              </div>
+
+            </div>
           </div>
-          <button mat-raised-button color="primary" type="button" (click)="onSubmitContactForm();">Submit</button>
         </div>
+        <button mat-raised-button color="primary" type="button" (click)="onSubmitContactForm();">Submit</button>
       </form>
     </div>
   </div>
+</section>
diff --git a/src/app/modules/errors/components/errors/errors.component.html b/src/app/modules/errors/components/errors/errors.component.html
index 2d47df5..e996fa5 100644
--- a/src/app/modules/errors/components/errors/errors.component.html
+++ b/src/app/modules/errors/components/errors/errors.component.html
@@ -1,7 +1,13 @@
-<div class="container">
-  <div class="row">
-    <div class="col-md-6 offset-md-3">
-      <h1 class="light-text">Ooops look you got lost :( 404 page</h1>
+<mat-grid-list cols="1" rowHeight="500">
+  <mat-grid-tile>
+    <div class="container my-5 mx-5">
+      <div class="row">
+        <div class="col-md-6 offset-md-3">
+          <h1 class="light-text">Ooops looks you got lost :( 404 page</h1>
+          <button mat-raised-button (click)="goBack();">Go back</button>
+        </div>
+      </div>
     </div>
-  </div>
-</div>
+
+  </mat-grid-tile>
+</mat-grid-list>
diff --git a/src/app/modules/errors/components/errors/errors.component.ts b/src/app/modules/errors/components/errors/errors.component.ts
index 84be177..2a15e81 100644
--- a/src/app/modules/errors/components/errors/errors.component.ts
+++ b/src/app/modules/errors/components/errors/errors.component.ts
@@ -6,10 +6,13 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./errors.component.css']
 })
 export class ErrorsComponent implements OnInit {
+  constructor() {}
 
-  constructor() { }
+  ngOnInit() {}
 
-  ngOnInit() {
-  }
+  // gaming/contact
 
+  public goBack(): void {
+    history.back();
+  }
 }
diff --git a/src/app/modules/errors/errors.module.ts b/src/app/modules/errors/errors.module.ts
index 051a472..e4bd2e7 100644
--- a/src/app/modules/errors/errors.module.ts
+++ b/src/app/modules/errors/errors.module.ts
@@ -1,9 +1,9 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ErrorsComponent } from './components/errors/errors.component';
-import { Routes, RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { MatGridListModule } from '@angular/material/grid-list';
-
+import { RouterModule, Routes } from '@angular/router';
+import { ErrorsComponent } from './components/errors/errors.component';
 const routes: Routes = [
   {
     path: '',
@@ -14,7 +14,7 @@ const routes: Routes = [
 
 @NgModule({
   declarations: [ErrorsComponent],
-  imports: [CommonModule, RouterModule.forChild(routes), MatGridListModule],
-  exports: [ErrorsComponent, RouterModule, MatGridListModule]
+  imports: [CommonModule, RouterModule.forChild(routes), MatGridListModule, MatButtonModule],
+  exports: [ErrorsComponent, RouterModule, MatGridListModule, MatButtonModule]
 })
 export class ErrorsModule {}
diff --git a/src/app/modules/shared-components/components/footer/footer.component.css b/src/app/modules/shared-components/components/footer/footer.component.css
index 18602d3..0eded2a 100644
--- a/src/app/modules/shared-components/components/footer/footer.component.css
+++ b/src/app/modules/shared-components/components/footer/footer.component.css
@@ -15,3 +15,8 @@
 .padding-left {
   padding-left: 5px !important;
 }
+
+.fixed {
+  position: fixed !important;
+  bottom: 0;
+}
diff --git a/src/app/modules/shared-components/components/footer/footer.component.html b/src/app/modules/shared-components/components/footer/footer.component.html
index 3f580f7..a6e7629 100644
--- a/src/app/modules/shared-components/components/footer/footer.component.html
+++ b/src/app/modules/shared-components/components/footer/footer.component.html
@@ -1,4 +1,4 @@
-<mat-toolbar color="primary">
+<mat-toolbar color="primary" [ngClass]="{'fixed': shouldBeFixed}">
   <small class="text-center light-text">&copy; 2019 Stefan Bogdanović</small>
   <span class="example-fill-remaining-space"></span>
 
diff --git a/src/app/modules/shared-components/components/footer/footer.component.ts b/src/app/modules/shared-components/components/footer/footer.component.ts
index e1f3075..e85c73d 100644
--- a/src/app/modules/shared-components/components/footer/footer.component.ts
+++ b/src/app/modules/shared-components/components/footer/footer.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
   selector: 'app-footer',
@@ -6,7 +7,16 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./footer.component.css']
 })
 export class FooterComponent implements OnInit {
-  constructor() {}
+  public shouldBeFixed: boolean;
 
-  ngOnInit() {}
+  constructor(private readonly route: ActivatedRoute, private readonly router: Router) {}
+
+  ngOnInit() {
+    let url: string;
+    if (this.router.routerState.snapshot.url === '/gaming/contact') {
+      this.shouldBeFixed = true;
+    } else if (this.router.routerState.snapshot.url === '/contact') {
+      this.shouldBeFixed = true;
+    }
+  }
 }
diff --git a/src/app/modules/shared-components/components/loading-spinner/loading-spinner.component.html b/src/app/modules/shared-components/components/loading-spinner/loading-spinner.component.html
index ce58e54..f905553 100644
--- a/src/app/modules/shared-components/components/loading-spinner/loading-spinner.component.html
+++ b/src/app/modules/shared-components/components/loading-spinner/loading-spinner.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="loading" id="overlay">
   <!-- <h1 id="loading-text" class="light-text text-center mx-2 my-5"></h1> -->
-  <!-- <mat-spinner class="my-5" [value]="400" color="warn"></mat-spinner> -->
-  <app-fingerprint-spinner [animationDuration]="1000" [size]="100" [color]="'#ff1d5e'">
+  <!-- <mat-spinner class="my-5" [value]="400" color="warn"></mat-spinner>  ff1d5e-->
+  <app-fingerprint-spinner [animationDuration]="1000" [size]="100" [color]="'#ffffff'">
   </app-fingerprint-spinner>
 </div>
diff --git a/src/app/modules/shared-components/shared-components.module.ts b/src/app/modules/shared-components/shared-components.module.ts
index b56edb7..2a08d73 100644
--- a/src/app/modules/shared-components/shared-components.module.ts
+++ b/src/app/modules/shared-components/shared-components.module.ts
@@ -1,20 +1,20 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSnackBar, MatSnackBarContainer, SimpleSnackBar } from '@angular/material/snack-bar';
+import { RouterModule } from '@angular/router';
+import { CustomIconService } from '@serviceicons/custom-icons.service';
+import { FingerprintSpinnerModule, SemipolarSpinnerModule } from 'angular-epic-spinners';
 import { HeaderComponent } from './components';
+import { BugReportDialogComponent } from './components/bug-report-dialog/bug-report-dialog.component';
 import { FooterComponent } from './components/footer/footer.component';
+import { HeroComponent } from './components/hero/hero.component';
 import { LoadingSpinnerComponent } from './components/loading-spinner/loading-spinner.component';
-import { FingerprintSpinnerModule } from 'angular-epic-spinners';
-import { RouterModule } from '@angular/router';
-import { MaterialModule } from './material/material.module';
 import { NotificationComponent } from './components/notification/notification.component';
-import { CustomIconService } from '@serviceicons/custom-icons.service';
-import { HeroComponent } from './components/hero/hero.component';
-import { BugReportDialogComponent } from './components/bug-report-dialog/bug-report-dialog.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MaterialModule } from './material/material.module';
 
-import { MatInputModule } from '@angular/material/input';
-import { MatSnackBar, MatSnackBarContainer, SimpleSnackBar } from '@angular/material/snack-bar';
 @NgModule({
   declarations: [
     HeaderComponent,
@@ -32,7 +32,8 @@ import { MatSnackBar, MatSnackBarContainer, SimpleSnackBar } from '@angular/mate
     FormsModule,
     MatInputModule,
     ReactiveFormsModule,
-    MatProgressSpinnerModule
+    MatProgressSpinnerModule,
+    SemipolarSpinnerModule
   ],
   exports: [
     HeaderComponent,
diff --git a/tsconfig.json b/tsconfig.json
index e15c1d2..612b0d7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,6 +30,5 @@
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true
-  },
-
+  }
 }