diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts
index 5b1634de6..24c14f7ec 100644
--- a/frontend/app/app.module.ts
+++ b/frontend/app/app.module.ts
@@ -57,7 +57,7 @@ export function configTranslations() {
     if (process.env.NODE_ENV === 'production') {
         return new LocalizerService(window['texts']);
     } else {
-        return new LocalizerService(require('./../backend/i18n/frontend_en.json')).logMissingKeys();
+        return new LocalizerService(require('./../../backend/i18n/frontend_en.json')).logMissingKeys();
     }
 }
 
diff --git a/frontend/app/features/apps/pages/apps-page.component.html b/frontend/app/features/apps/pages/apps-page.component.html
index a01d68357..936e615ab 100644
--- a/frontend/app/features/apps/pages/apps-page.component.html
+++ b/frontend/app/features/apps/pages/apps-page.component.html
@@ -1,135 +1,137 @@
 <sqx-title message="i18n:apps.listPageTitle"></sqx-title>
 
-<div class="apps-section">
-    <h1 class="apps-title">{{ 'apps.welcomeTitle' | sqxTranslate: { user: authState.user?.displayName } }}</h1>
+<div class="panel-container page">  
+    <div class="apps-section">
+        <h1 class="apps-title">{{ 'apps.welcomeTitle' | sqxTranslate: { user: authState.user?.displayName } }}</h1>
 
-    <div class="subtext">
-        {{ 'apps.welcomeSubtitle' | sqxTranslate }}
+        <div class="subtext">
+            {{ 'apps.welcomeSubtitle' | sqxTranslate }}
+        </div>
     </div>
-</div>
 
-<ng-container *ngIf="appsState.apps | async; let apps">
-    <div class="apps-section">
-        <div class="empty" *ngIf="apps.length === 0">
-            <h3 class="empty-headline">{{ 'apps.empty' | sqxTranslate }}</h3>
-        </div>
+    <ng-container *ngIf="appsState.apps | async; let apps">
+        <div class="apps-section">
+            <div class="empty" *ngIf="apps.length === 0">
+                <h3 class="empty-headline">{{ 'apps.empty' | sqxTranslate }}</h3>
+            </div>
 
-        <div class="card card-href card-app" *ngFor="let app of apps; trackBy: trackByApp" [routerLink]="['/app', app.name]">
-            <div class="card-body">
-                <div class="row no-gutters">
-                    <div class="col-auto card-left">
-                        <sqx-avatar [image]="app.image" [identifier]="app.name"></sqx-avatar>
-                    </div>
-                    <div class="col card-right">
-                        <h3 class="card-title">{{app.displayName}}</h3>
-
-                        <div class="card-text card-links">
-                            <a [routerLink]="['/app', app.name]" sqxStopClick>{{ 'common.edit' | sqxTranslate }}</a>
-
-                            <span class="deeplinks">
-                                &nbsp;|
-                                <a [routerLink]="['/app', app.name, 'content']" sqxStopClick>{{ 'common.content' | sqxTranslate }}</a> &middot;
-                                <a [routerLink]="['/app', app.name, 'assets']" sqxStopClick>{{ 'common.assets' | sqxTranslate }}</a> &middot;
-                                <a [routerLink]="['/app', app.name, 'settings']" sqxStopClick>{{ 'common.settings' | sqxTranslate }}</a>
-                            </span>
+            <div class="card card-href card-app" *ngFor="let app of apps; trackBy: trackByApp" [routerLink]="['/app', app.name]">
+                <div class="card-body">
+                    <div class="row no-gutters">
+                        <div class="col-auto card-left">
+                            <sqx-avatar [image]="app.image" [identifier]="app.name"></sqx-avatar>
                         </div>
-
-                        <div class="card-text" *ngIf="app.description">
-                            {{app.description}}
+                        <div class="col card-right">
+                            <h3 class="card-title">{{app.displayName}}</h3>
+
+                            <div class="card-text card-links">
+                                <a [routerLink]="['/app', app.name]" sqxStopClick>{{ 'common.edit' | sqxTranslate }}</a>
+
+                                <span class="deeplinks">
+                                    &nbsp;|
+                                    <a [routerLink]="['/app', app.name, 'content']" sqxStopClick>{{ 'common.content' | sqxTranslate }}</a> &middot;
+                                    <a [routerLink]="['/app', app.name, 'assets']" sqxStopClick>{{ 'common.assets' | sqxTranslate }}</a> &middot;
+                                    <a [routerLink]="['/app', app.name, 'settings']" sqxStopClick>{{ 'common.settings' | sqxTranslate }}</a>
+                                </span>
+                            </div>
+
+                            <div class="card-text" *ngIf="app.description">
+                                {{app.description}}
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-</ng-container>
+    </ng-container>
 
-<div class="apps-section" *ngIf="(uiState.settings | async).canCreateApps">
-    <div class="card card-template card-href" (click)="createNewApp('')">
-        <div class="card-body">
-            <div class="card-image">
-                <img src="./images/add-app.svg">
-            </div>
+    <div class="apps-section" *ngIf="(uiState.settings | async).canCreateApps">
+        <div class="card card-template card-href" (click)="createNewApp('')">
+            <div class="card-body">
+                <div class="card-image">
+                    <img src="./images/add-app.svg">
+                </div>
 
-            <h3 class="card-title">{{ 'apps.createBlankApp' | sqxTranslate }}</h3>
+                <h3 class="card-title">{{ 'apps.createBlankApp' | sqxTranslate }}</h3>
 
-            <div class="card-text">
-                {{ 'apps.createBlankAppDescription' | sqxTranslate }}
+                <div class="card-text">
+                    {{ 'apps.createBlankAppDescription' | sqxTranslate }}
+                </div>
             </div>
         </div>
-    </div>
 
-    <div class="card card-template card-href" (click)="createNewApp('Blog')">
-        <div class="card-body">
-            <div class="card-image">
-                <img src="./images/add-blog.svg">
-            </div>
+        <div class="card card-template card-href" (click)="createNewApp('Blog')">
+            <div class="card-body">
+                <div class="card-image">
+                    <img src="./images/add-blog.svg">
+                </div>
 
-            <h3 class="card-title">{{ 'apps.createBlogApp' | sqxTranslate }}</h3>
+                <h3 class="card-title">{{ 'apps.createBlogApp' | sqxTranslate }}</h3>
 
-            <div class="card-text">
-                <div>{{ 'apps.createBlogAppDescription' | sqxTranslate }}</div>
-                <div>
-                    {{ 'common.sampleCodeLabel' | sqxTranslate }} <a href="https://github.com/Squidex/squidex-samples" sqxStopClick sqxExternalLink>{{ 'common.github' | sqxTranslate }}</a>
+                <div class="card-text">
+                    <div>{{ 'apps.createBlogAppDescription' | sqxTranslate }}</div>
+                    <div>
+                        {{ 'common.sampleCodeLabel' | sqxTranslate }} <a href="https://github.com/Squidex/squidex-samples" sqxStopClick sqxExternalLink>{{ 'common.github' | sqxTranslate }}</a>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="card card-template card-href" (click)="createNewApp('Identity')">
-        <div class="card-body">
-            <div class="card-image">
-                <img src="./images/add-identity.svg">
-            </div>
+        <div class="card card-template card-href" (click)="createNewApp('Identity')">
+            <div class="card-body">
+                <div class="card-image">
+                    <img src="./images/add-identity.svg">
+                </div>
 
-            <h3 class="card-title">{{ 'apps.createIdentityApp' | sqxTranslate }}</h3>
+                <h3 class="card-title">{{ 'apps.createIdentityApp' | sqxTranslate }}</h3>
 
-            <div class="card-text">
-                <div>{{ 'apps.createIdentityAppDescription' | sqxTranslate }}</div>
-                <div>
-                    <a href="https://github.com/Squidex/squidex-identity" sqxStopClick sqxExternalLink>{{ 'common.project' | sqxTranslate }}</a>
+                <div class="card-text">
+                    <div>{{ 'apps.createIdentityAppDescription' | sqxTranslate }}</div>
+                    <div>
+                        <a href="https://github.com/Squidex/squidex-identity" sqxStopClick sqxExternalLink>{{ 'common.project' | sqxTranslate }}</a>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="card card-template card-href" (click)="createNewApp('IdentityV2')">
-        <div class="card-body">
-            <div class="card-image">
-                <img src="./images/add-identity.svg">
-            </div>
+        <div class="card card-template card-href" (click)="createNewApp('IdentityV2')">
+            <div class="card-body">
+                <div class="card-image">
+                    <img src="./images/add-identity.svg">
+                </div>
 
-            <h3 class="card-title">{{ 'apps.createIdentityAppV2' | sqxTranslate }}</h3>
+                <h3 class="card-title">{{ 'apps.createIdentityAppV2' | sqxTranslate }}</h3>
 
-            <div class="card-text">
-                <div>{{ 'apps.createIdentityAppV2Description' | sqxTranslate }}</div>
-                <div>
-                    <a href="https://github.com/Squidex/squidex-identity" sqxStopClick sqxExternalLink>{{ 'common.project' | sqxTranslate }}</a>
+                <div class="card-text">
+                    <div>{{ 'apps.createIdentityAppV2Description' | sqxTranslate }}</div>
+                    <div>
+                        <a href="https://github.com/Squidex/squidex-identity" sqxStopClick sqxExternalLink>{{ 'common.project' | sqxTranslate }}</a>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="card card-template card-href" (click)="createNewApp('Profile')">
-        <div class="card-body">
-            <div class="card-image">
-                <img src="./images/add-profile.svg">
-            </div>
+        <div class="card card-template card-href" (click)="createNewApp('Profile')">
+            <div class="card-body">
+                <div class="card-image">
+                    <img src="./images/add-profile.svg">
+                </div>
 
-            <h3 class="card-title">{{ 'apps.createProfileApp' | sqxTranslate }}</h3>
+                <h3 class="card-title">{{ 'apps.createProfileApp' | sqxTranslate }}</h3>
 
-            <div class="card-text">
-                <div>{{ 'apps.createProfileAppDescription' | sqxTranslate }}</div>
-                <div>
-                    {{ 'common.sampleCodeLabel' | sqxTranslate }} <a href="https://github.com/Squidex/squidex-samples" sqxStopClick sqxExternalLink>{{ 'common.github' | sqxTranslate }}</a>
+                <div class="card-text">
+                    <div>{{ 'apps.createProfileAppDescription' | sqxTranslate }}</div>
+                    <div>
+                        {{ 'common.sampleCodeLabel' | sqxTranslate }} <a href="https://github.com/Squidex/squidex-samples" sqxStopClick sqxExternalLink>{{ 'common.github' | sqxTranslate }}</a>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 
-<div *ngIf="info" class="apps-section">
-    <small class="info">{{info}}</small>
+    <div *ngIf="info" class="apps-section">
+        <small class="info">{{info}}</small>
+    </div>
 </div>
 
 <ng-container *sqxModal="addAppDialog">
diff --git a/frontend/app/features/apps/pages/apps-page.component.scss b/frontend/app/features/apps/pages/apps-page.component.scss
index 1bbb3e9df..aba469f94 100644
--- a/frontend/app/features/apps/pages/apps-page.component.scss
+++ b/frontend/app/features/apps/pages/apps-page.component.scss
@@ -9,6 +9,11 @@
     }
 }
 
+.page {
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+
 .card {
     & {
         @include hover-visible('.deeplinks', inline-block);
diff --git a/frontend/app/shared/components/assets/asset-uploader.component.html b/frontend/app/shared/components/assets/asset-uploader.component.html
index 8dbc3b0dd..6fc1628c0 100644
--- a/frontend/app/shared/components/assets/asset-uploader.component.html
+++ b/frontend/app/shared/components/assets/asset-uploader.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="appsState.selectedAppOrNull | async; let app">
     <ng-container *ngIf="app.canUploadAssets">
-        <ul class="nav navbar-nav" *ngIf="assetUploader.uploads | async; let uploads" (sqxDropFile)="addFiles($event)">
+        <ul class="nav navbar-nav align-items-center" *ngIf="assetUploader.uploads | async; let uploads" (sqxDropFile)="addFiles($event)">
             <li class="nav-item nav-icon dropdown">
                 <span class="nav-link dropdown-toggle" (click)="modalMenu.toggle()">
                     <i class="icon-upload-3"></i>
diff --git a/frontend/app/shell/pages/internal/apps-menu.component.html b/frontend/app/shell/pages/internal/apps-menu.component.html
index 1911172e5..e2435ce7b 100644
--- a/frontend/app/shell/pages/internal/apps-menu.component.html
+++ b/frontend/app/shell/pages/internal/apps-menu.component.html
@@ -1,4 +1,4 @@
-<ul class="nav navbar-nav">
+<ul class="nav navbar-nav align-items-center">
     <li class="nav-item dropdown">
         <span class="nav-link dropdown-toggle" id="app-name" (click)="appsMenu.toggle()" #button>
             <ng-container *ngIf="appsState.selectedAppOrNull | async; let app; else noApp">
diff --git a/frontend/app/shell/pages/internal/internal-area.component.html b/frontend/app/shell/pages/internal/internal-area.component.html
index 96f980229..6321e767d 100644
--- a/frontend/app/shell/pages/internal/internal-area.component.html
+++ b/frontend/app/shell/pages/internal/internal-area.component.html
@@ -7,7 +7,7 @@
         <sqx-apps-menu></sqx-apps-menu>
     </div>
 
-    <div class="navbar-nav ml-auto">
+    <div class="navbar-nav align-items-center ml-auto">
         <sqx-search-menu></sqx-search-menu>
 
         <sqx-asset-uploader></sqx-asset-uploader>
diff --git a/frontend/app/shell/pages/internal/notifications-menu.component.html b/frontend/app/shell/pages/internal/notifications-menu.component.html
index 89aa41020..d601b17ea 100644
--- a/frontend/app/shell/pages/internal/notifications-menu.component.html
+++ b/frontend/app/shell/pages/internal/notifications-menu.component.html
@@ -1,3 +1,3 @@
-<ul class="nav navbar-nav">
+<ul class="nav navbar-nav align-items-center">
     <sqx-notifo></sqx-notifo>
 </ul>
\ No newline at end of file
diff --git a/frontend/app/shell/pages/internal/profile-menu.component.html b/frontend/app/shell/pages/internal/profile-menu.component.html
index 92b51c0ab..1ff7839ca 100644
--- a/frontend/app/shell/pages/internal/profile-menu.component.html
+++ b/frontend/app/shell/pages/internal/profile-menu.component.html
@@ -1,4 +1,4 @@
-<ul class="nav navbar-nav">
+<ul class="nav navbar-nav align-items-center">
     <li class="nav-item nav-icon nav-item-help">
         <a class="nav-link" href="https://squidex.io/help" sqxExternalLink="noicon">
             <i class="icon-help2"></i>