diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index 2687c2cf81..438c315c16 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -5,7 +5,13 @@
 >
   <div class="container ">
     <a class="navbar-brand" routerLink="/">
-      <img *ngIf="appInfo.logoUrl; else appName" [src]="appInfo.logoUrl" [alt]="appInfo.name" />
+      <img
+        *ngIf="appInfo.logoUrl; else appName"
+        [src]="appInfo.logoUrl"
+        [alt]="appInfo.name"
+        width="100%"
+        height="auto"
+      />
     </a>
     <button
       class="navbar-toggler"
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
index 7d7947e833..75ab177fb4 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
@@ -28,6 +28,7 @@ import snq from 'snq';
 import { AddNavigationElement } from '../../actions';
 import { Layout } from '../../models/layout';
 import { LayoutState } from '../../states';
+import { eNavigationElementNames } from '../../enums/navigation-element-names';
 
 @Component({
   selector: 'abp-layout-application',
@@ -131,11 +132,11 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
       .selectSnapshot(LayoutState.getNavigationElements)
       .map(({ name }) => name);
 
-    if (navigations.indexOf('LanguageRef') < 0) {
+    if (navigations.indexOf(eNavigationElementNames.Language) < 0) {
       this.store.dispatch(
         new AddNavigationElement([
-          { element: this.languageRef, order: 4, name: 'LanguageRef' },
-          { element: this.currentUserRef, order: 5, name: 'CurrentUserRef' },
+          { element: this.languageRef, order: 4, name: eNavigationElementNames.Language },
+          { element: this.currentUserRef, order: 5, name: eNavigationElementNames.User },
         ]),
       );
     }
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/enums/index.ts b/npm/ng-packs/packages/theme-basic/src/lib/enums/index.ts
new file mode 100644
index 0000000000..51f9e1ead1
--- /dev/null
+++ b/npm/ng-packs/packages/theme-basic/src/lib/enums/index.ts
@@ -0,0 +1,2 @@
+export * from './components';
+export * from './navigation-element-names';
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/enums/navigation-element-names.ts b/npm/ng-packs/packages/theme-basic/src/lib/enums/navigation-element-names.ts
new file mode 100644
index 0000000000..12aa3f0941
--- /dev/null
+++ b/npm/ng-packs/packages/theme-basic/src/lib/enums/navigation-element-names.ts
@@ -0,0 +1,4 @@
+export const enum eNavigationElementNames {
+  Language = 'LanguageRef',
+  User = 'CurrentUserRef',
+}
diff --git a/npm/ng-packs/packages/theme-basic/src/public-api.ts b/npm/ng-packs/packages/theme-basic/src/public-api.ts
index ee01995829..580366dbcb 100644
--- a/npm/ng-packs/packages/theme-basic/src/public-api.ts
+++ b/npm/ng-packs/packages/theme-basic/src/public-api.ts
@@ -5,6 +5,7 @@
 export * from './lib/theme-basic.module';
 export * from './lib/actions';
 export * from './lib/components';
-export * from './lib/enums/components';
+export * from './lib/enums';
 export * from './lib/models';
+export * from './lib/services';
 export * from './lib/states';