diff --git a/package-lock.json b/package-lock.json
index 3d6c344e..beb1217c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2705,6 +2705,11 @@
       "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-5.0.0.tgz",
       "integrity": "sha512-oD8XP8hqgjvKRE90Qrixb2n2qbYpkwUnpiqOHcLvDN7i+MVGpr8aZOogidTGZi+BkBlG7P6fAkPFjlhAmXlxzg=="
     },
+    "@nebular/bootstrap": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-5.0.0.tgz",
+      "integrity": "sha512-/aVCqZKWRFz2wet07/+EsAzDNCoU3EyBhQFhwkqNtK2QMYu66d1uQqrC0TwxkMHye5uXfsndM64gXSYe/ZumZA=="
+    },
     "@nebular/eva-icons": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@nebular/eva-icons/-/eva-icons-5.0.0.tgz",
diff --git a/package.json b/package.json
index dfe0a95f..d630f25b 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "@angular/router": "^9.0.4",
     "@asymmetrik/ngx-leaflet": "3.0.1",
     "@nebular/auth": "5.0.0",
+    "@nebular/bootstrap": "^5.0.0",
     "@nebular/eva-icons": "5.0.0",
     "@nebular/security": "5.0.0",
     "@nebular/theme": "5.0.0",
diff --git a/src/app/@theme/components/header/header.component.html b/src/app/@theme/components/header/header.component.html
index 44184b8b..7a52977a 100644
--- a/src/app/@theme/components/header/header.component.html
+++ b/src/app/@theme/components/header/header.component.html
@@ -42,7 +42,7 @@
       <nb-icon icon="download"></nb-icon>
       <span class="subtitle number">470.000</span>
     </nb-action>
-    <nb-action class="control-item contact-us" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true">
+    <nb-action class="control-item contact-us" matRipple [matRippleUnbounded]="false" [matRippleCentered]="true">
       <a nbButton ghost href="mailto:contact@akveo.com" (click)="trackEmailClick()">
         <nb-icon icon="email-outline" pack="eva"></nb-icon>
         <span>contact@akveo.com</span>
@@ -53,7 +53,7 @@
     </nb-action>
     <nb-action class="control-item email" icon="email-outline" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></nb-action>
     <nb-action class="control-item notifications" icon="bell-outline" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true"></nb-action>
-    <nb-action class="user-action" *nbIsGranted="['view', 'user']" matRipple [matRippleUnbounded]="true" [matRippleCentered]="true">
+    <nb-action class="user-action" *nbIsGranted="['view', 'user']" matRipple [matRippleUnbounded]="false" [matRippleCentered]="true">
       <nb-user [nbContextMenu]="userMenu"
                [onlyPicture]="userPictureOnly"
                [name]="user?.name"
diff --git a/src/app/themes-screen/starter-routing.module.ts b/src/app/themes-screen/starter-routing.module.ts
index 17751dda..757f0d93 100644
--- a/src/app/themes-screen/starter-routing.module.ts
+++ b/src/app/themes-screen/starter-routing.module.ts
@@ -1,6 +1,5 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
-import {StarterScreenComponent} from './starter-screen.component';
 import {NgxStarterComponent} from './starter.component';
 
 const routes: Routes = [{
@@ -9,7 +8,7 @@ const routes: Routes = [{
   children: [
     {
       path: '',
-      component: StarterScreenComponent,
+      component: NgxStarterComponent,
     },
     ],
 }];
diff --git a/src/app/themes-screen/starter-screen.component.ts b/src/app/themes-screen/starter-screen.component.ts
deleted file mode 100644
index 67976d28..00000000
--- a/src/app/themes-screen/starter-screen.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-starter-screen',
-  styleUrls: ['./starter.component.scss'],
-  templateUrl: './starter.component.html',
-})
-export class StarterScreenComponent {
-
-}
diff --git a/src/app/themes-screen/starter.module.ts b/src/app/themes-screen/starter.module.ts
index d9020e12..b8f77d90 100644
--- a/src/app/themes-screen/starter.module.ts
+++ b/src/app/themes-screen/starter.module.ts
@@ -1,5 +1,4 @@
 import {NgModule} from '@angular/core';
-import {StarterScreenComponent} from './starter-screen.component';
 import {StarterRoutingModule} from './starter-routing.module';
 import {NgxStarterComponent} from './starter.component';
 import {NbActionsModule, NbButtonModule, NbCardModule, NbIconModule, NbLayoutModule} from '@nebular/theme';
@@ -20,7 +19,7 @@ const NB_MODULES = [
     NbActionsModule,
   ],
   declarations: [
-    StarterScreenComponent,
+    NgxStarterComponent,
     NgxStarterComponent,
   ],
 })