diff --git a/src/app/about/about.module.ts b/src/app/about/about.module.ts
deleted file mode 100644
index 5cb0cae..0000000
--- a/src/app/about/about.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { AboutRoutingModule } from './about-routing.module';
-import { AboutComponent } from './about.component';
-
-@NgModule({
-  imports: [CommonModule, TranslateModule, AboutRoutingModule],
-  declarations: [AboutComponent]
-})
-export class AboutModule {}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index a29656a..e399199 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,7 +3,7 @@ import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
 import { Shell } from '@app/shell/shell.service';
 
 const routes: Routes = [
-  Shell.childRoutes([{ path: 'about', loadChildren: './about/about.module#AboutModule' }]),
+  Shell.childRoutes([{ path: 'map', loadChildren: './map/map.module#MapModule' }]),
   // Fallback when no prior route is matched
   { path: '**', redirectTo: '', pathMatch: 'full' }
 ];
diff --git a/src/app/about/about-routing.module.ts b/src/app/map/map-routing.module.ts
similarity index 66%
rename from src/app/about/about-routing.module.ts
rename to src/app/map/map-routing.module.ts
index 49febb5..fec8d56 100644
--- a/src/app/about/about-routing.module.ts
+++ b/src/app/map/map-routing.module.ts
@@ -2,11 +2,11 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 import { extract } from '@app/core';
-import { AboutComponent } from './about.component';
+import { MapComponent } from './map.component';
 
 const routes: Routes = [
   // Module is lazy loaded, see app-routing.module.ts
-  { path: '', component: AboutComponent, data: { title: extract('About') } }
+  { path: '', component: MapComponent, data: { title: extract('Map') } }
 ];
 
 @NgModule({
@@ -14,4 +14,4 @@ const routes: Routes = [
   exports: [RouterModule],
   providers: []
 })
-export class AboutRoutingModule {}
+export class MapRoutingModule {}
diff --git a/src/app/about/about.component.html b/src/app/map/map.component.html
similarity index 100%
rename from src/app/about/about.component.html
rename to src/app/map/map.component.html
diff --git a/src/app/about/about.component.scss b/src/app/map/map.component.scss
similarity index 64%
rename from src/app/about/about.component.scss
rename to src/app/map/map.component.scss
index e510407..0998829 100644
--- a/src/app/about/about.component.scss
+++ b/src/app/map/map.component.scss
@@ -6,3 +6,7 @@
 .mapDiv {
   text-align: left;
 }
+
+.mapboxgl-marker {
+  cursor: pointer;
+}
diff --git a/src/app/about/about.component.spec.ts b/src/app/map/map.component.spec.ts
similarity index 57%
rename from src/app/about/about.component.spec.ts
rename to src/app/map/map.component.spec.ts
index 063616a..0173679 100644
--- a/src/app/about/about.component.spec.ts
+++ b/src/app/map/map.component.spec.ts
@@ -1,19 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AboutComponent } from './about.component';
+import { MapComponent } from './map.component';
 
-describe('AboutComponent', () => {
-  let component: AboutComponent;
-  let fixture: ComponentFixture<AboutComponent>;
+describe('MapComponent', () => {
+  let component: MapComponent;
+  let fixture: ComponentFixture<MapComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [AboutComponent]
+      declarations: [MapComponent]
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AboutComponent);
+    fixture = TestBed.createComponent(MapComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/about/about.component.ts b/src/app/map/map.component.ts
similarity index 92%
rename from src/app/about/about.component.ts
rename to src/app/map/map.component.ts
index 9e0cb81..01e6efe 100644
--- a/src/app/about/about.component.ts
+++ b/src/app/map/map.component.ts
@@ -8,11 +8,11 @@ import { LogsService } from '@app/logs.service';
 import { interval } from 'rxjs';
 
 @Component({
-  selector: 'app-about',
-  templateUrl: './about.component.html',
-  styleUrls: ['./about.component.scss']
+  selector: 'app-map',
+  templateUrl: './map.component.html',
+  styleUrls: ['./map.component.scss']
 })
-export class AboutComponent implements OnInit {
+export class MapComponent implements OnInit {
   version: string | null = environment.version;
 
   // data: Array<Object>;
diff --git a/src/app/map/map.module.ts b/src/app/map/map.module.ts
new file mode 100644
index 0000000..6a8d840
--- /dev/null
+++ b/src/app/map/map.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { MapRoutingModule } from './map-routing.module';
+import { MapComponent } from './map.component';
+
+@NgModule({
+  imports: [CommonModule, TranslateModule, MapRoutingModule],
+  declarations: [MapComponent]
+})
+export class MapModule {}
diff --git a/src/app/shell/header/header.component.html b/src/app/shell/header/header.component.html
index 7fd236a..61d3bdd 100644
--- a/src/app/shell/header/header.component.html
+++ b/src/app/shell/header/header.component.html
@@ -15,14 +15,18 @@
       <div class="navbar-nav">
         <a class="nav-item nav-link text-uppercase" routerLink="/home" routerLinkActive="active">
           <i class="fas fa-home"></i>
-          <span translate>Home</span>
+          <span translate> Home</span>
         </a>
-        <a class="nav-item nav-link text-uppercase" routerLink="/about" routerLinkActive="active">
-          <i class="fas fa-question-circle"></i>
-          <span translate>About</span>
+        <a class="nav-item nav-link text-uppercase" routerLink="/map" routerLinkActive="active">
+          <i class="fas fa-map"></i>
+          <span translate> Map</span>
+        </a>
+        <a class="nav-item nav-link text-uppercase" routerLink="/chart" routerLinkActive="active">
+          <i class="fas fa-chart-area"></i>
+          <span translate> Chart</span>
         </a>
       </div>
-      <div class="navbar-nav ml-auto">
+      <!-- <div class="navbar-nav ml-auto">
         <div class="nav-item" ngbDropdown display="dynamic" placement="bottom-right">
           <a id="language-dropdown" class="nav-link" ngbDropdownToggle>{{ currentLanguage }}</a>
           <div ngbDropdownMenu aria-labelledby="language-dropdown">
@@ -31,7 +35,7 @@
             </button>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
   </nav>
 </header>