diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts
index 3cb4859c..ebfbcac5 100644
--- a/src/@fuse/components/theme-options/theme-options.component.ts
+++ b/src/@fuse/components/theme-options/theme-options.component.ts
@@ -130,7 +130,7 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
                     'type'    : 'item',
                     'icon'    : 'settings',
                     'function': () => {
-                        this._toggleSidebarOpen('themeOptionsPanel');
+                        this.toggleSidebarOpen('themeOptionsPanel');
                     }
                 }
             ]
@@ -281,13 +281,16 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy
         }
     }
 
+    // -----------------------------------------------------------------------------------------------------
+    // @ Public methods
+    // -----------------------------------------------------------------------------------------------------
+
     /**
      * Toggle sidebar open
      *
      * @param key
-     * @private
      */
-    private _toggleSidebarOpen(key): void
+    toggleSidebarOpen(key): void
     {
         this._fuseSidebarService.getSidebar(key).toggleOpen();
     }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 950d5f1a..b1bd2000 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -20,7 +20,7 @@
 
 <!-- THEME OPTIONS PANEL -->
 <button mat-icon-button class="mat-primary-bg mat-elevation-z2 theme-options-button"
-        (click)="_toggleSidebarOpen('themeOptionsPanel')">
+        (click)="toggleSidebarOpen('themeOptionsPanel')">
     <mat-icon>settings</mat-icon>
 </button>
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a27d185a..685ad80e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -98,16 +98,15 @@ export class AppComponent implements OnInit, OnDestroy
     }
 
     // -----------------------------------------------------------------------------------------------------
-    // @ Private methods
+    // @ Public methods
     // -----------------------------------------------------------------------------------------------------
 
     /**
      * Toggle sidebar open
      *
      * @param key
-     * @private
      */
-    private _toggleSidebarOpen(key): void
+    private toggleSidebarOpen(key): void
     {
         this._fuseSidebarService.getSidebar(key).toggleOpen();
     }
diff --git a/src/app/layout/components/toolbar/toolbar.component.html b/src/app/layout/components/toolbar/toolbar.component.html
index 8de3436e..e1eeefc1 100644
--- a/src/app/layout/components/toolbar/toolbar.component.html
+++ b/src/app/layout/components/toolbar/toolbar.component.html
@@ -13,7 +13,7 @@
 
             <div class="toolbar-separator" *ngIf="!hiddenNavbar && !rightNavbar" fxHide.gt-md></div>
 
-            <div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
+            <div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNavbar">
                 <div class="logo ml-16">
                     <img class="logo-icon" src="assets/images/logos/fuse.svg">
                 </div>
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.html b/src/app/main/apps/calendar/event-form/event-form.component.html
index 40deeb94..2937cf67 100644
--- a/src/app/main/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/apps/calendar/event-form/event-form.component.html
@@ -2,7 +2,7 @@
     <mat-toolbar class="mat-accent m-0">
         <mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
             <span class="title dialog-title">{{dialogTitle}}</span>
-            <button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
+            <button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
                 <mat-icon>close</mat-icon>
             </button>
         </mat-toolbar-row>
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.ts b/src/app/main/apps/calendar/event-form/event-form.component.ts
index f47e6f3e..3b1e7c39 100644
--- a/src/app/main/apps/calendar/event-form/event-form.component.ts
+++ b/src/app/main/apps/calendar/event-form/event-form.component.ts
@@ -25,12 +25,12 @@ export class CalendarEventFormDialogComponent
     /**
      * Constructor
      *
-     * @param {MatDialogRef<CalendarEventFormDialogComponent>} _matDialogRef
+     * @param {MatDialogRef<CalendarEventFormDialogComponent>} matDialogRef
      * @param _data
      * @param {FormBuilder} _formBuilder
      */
     constructor(
-        private _matDialogRef: MatDialogRef<CalendarEventFormDialogComponent>,
+        public matDialogRef: MatDialogRef<CalendarEventFormDialogComponent>,
         @Inject(MAT_DIALOG_DATA) private _data: any,
         private _formBuilder: FormBuilder
     )
diff --git a/src/app/main/apps/chat/chat-view/chat-view.component.html b/src/app/main/apps/chat/chat-view/chat-view.component.html
index 747600d3..d1a72c6d 100644
--- a/src/app/main/apps/chat/chat-view/chat-view.component.html
+++ b/src/app/main/apps/chat/chat-view/chat-view.component.html
@@ -91,8 +91,8 @@
 
         <!-- REPLY FORM -->
         <form #replyForm="ngForm"
-              (ngSubmit)="reply($event)"
-              (keyup.enter)="reply($event)"
+              (ngSubmit)="reply()"
+              (keyup.enter)="reply()"
               fxFlex class="reply-form"
               fxLayout="row"
               fxLayoutAlign="start center">
diff --git a/src/app/main/apps/contacts/contact-form/contact-form.component.html b/src/app/main/apps/contacts/contact-form/contact-form.component.html
index 4e4fb932..47985052 100644
--- a/src/app/main/apps/contacts/contact-form/contact-form.component.html
+++ b/src/app/main/apps/contacts/contact-form/contact-form.component.html
@@ -2,7 +2,7 @@
     <mat-toolbar matDialogTitle class="mat-accent m-0">
         <mat-toolbar-row fxLayout="row" fxLayoutAlign="space-between center">
             <span class="title dialog-title">{{dialogTitle}}</span>
-            <button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
+            <button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
                 <mat-icon>close</mat-icon>
             </button>
         </mat-toolbar-row>
diff --git a/src/app/main/apps/contacts/contact-form/contact-form.component.ts b/src/app/main/apps/contacts/contact-form/contact-form.component.ts
index b72654cb..eb5f3dcd 100644
--- a/src/app/main/apps/contacts/contact-form/contact-form.component.ts
+++ b/src/app/main/apps/contacts/contact-form/contact-form.component.ts
@@ -21,12 +21,12 @@ export class ContactsContactFormDialogComponent
     /**
      * Constructor
      *
-     * @param {MatDialogRef<ContactsContactFormDialogComponent>} _matDialogRef
+     * @param {MatDialogRef<ContactsContactFormDialogComponent>} matDialogRef
      * @param _data
      * @param {FormBuilder} _formBuilder
      */
     constructor(
-        private _matDialogRef: MatDialogRef<ContactsContactFormDialogComponent>,
+        public matDialogRef: MatDialogRef<ContactsContactFormDialogComponent>,
         @Inject(MAT_DIALOG_DATA) private _data: any,
         private _formBuilder: FormBuilder
     )
diff --git a/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html
index 0cd14c7c..9a82ce7e 100644
--- a/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html
+++ b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.html
@@ -2,7 +2,7 @@
     <mat-toolbar class="mat-accent m-0">
         <mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
             <span class="title dialog-title">New Message</span>
-            <button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
+            <button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
                 <mat-icon>close</mat-icon>
             </button>
         </mat-toolbar-row>
@@ -86,7 +86,7 @@
     <div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
         <div>
             <button mat-raised-button
-                    (click)="_matDialogRef.close(['send',composeForm])"
+                    (click)="matDialogRef.close(['send',composeForm])"
                     class="save-button mat-accent"
                     [disabled]="composeForm.invalid"
                     aria-label="SAVE">
@@ -98,7 +98,7 @@
             </button>
         </div>
 
-        <button mat-icon-button (click)="_matDialogRef.close(['delete',composeForm])" aria-label="Delete"
+        <button mat-icon-button (click)="matDialogRef.close(['delete',composeForm])" aria-label="Delete"
                 matTooltip="Delete">
             <mat-icon>delete</mat-icon>
         </button>
diff --git a/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts
index df1a55f1..b4f6e742 100644
--- a/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts
+++ b/src/app/main/apps/mail-ngrx/dialogs/compose/compose.component.ts
@@ -15,12 +15,12 @@ export class MailNgrxComposeDialogComponent
     /**
      * Constructor
      *
-     * @param {MatDialogRef<MailNgrxComposeDialogComponent>} _matDialogRef
+     * @param {MatDialogRef<MailNgrxComposeDialogComponent>} matDialogRef
      * @param _data
      * @param {FormBuilder} _formBuilder
      */
     constructor(
-        private _matDialogRef: MatDialogRef<MailNgrxComposeDialogComponent>,
+        public matDialogRef: MatDialogRef<MailNgrxComposeDialogComponent>,
         @Inject(MAT_DIALOG_DATA) private _data: any,
         private _formBuilder: FormBuilder
     )
diff --git a/src/app/main/apps/mail/dialogs/compose/compose.component.html b/src/app/main/apps/mail/dialogs/compose/compose.component.html
index 7a8971bd..f504259f 100644
--- a/src/app/main/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/apps/mail/dialogs/compose/compose.component.html
@@ -2,7 +2,7 @@
     <mat-toolbar class="mat-accent m-0">
         <mat-toolbar-row fxFlex fxLayout="row" fxLayoutAlign="space-between center">
             <span class="title dialog-title">New Message</span>
-            <button mat-icon-button (click)="_matDialogRef.close()" aria-label="Close dialog">
+            <button mat-icon-button (click)="matDialogRef.close()" aria-label="Close dialog">
                 <mat-icon>close</mat-icon>
             </button>
         </mat-toolbar-row>
@@ -91,7 +91,7 @@
     <div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="space-between center">
         <div>
             <button mat-raised-button
-                    (click)="_matDialogRef.close(['send',composeForm])"
+                    (click)="matDialogRef.close(['send',composeForm])"
                     class="save-button mat-accent"
                     [disabled]="composeForm.invalid"
                     aria-label="SAVE">
@@ -103,7 +103,7 @@
             </button>
         </div>
 
-        <button mat-icon-button (click)="_matDialogRef.close(['delete',composeForm])"
+        <button mat-icon-button (click)="matDialogRef.close(['delete',composeForm])"
                 aria-label="Delete"
                 matTooltip="Delete">
             <mat-icon>delete</mat-icon>
diff --git a/src/app/main/apps/mail/dialogs/compose/compose.component.ts b/src/app/main/apps/mail/dialogs/compose/compose.component.ts
index 2a5fc0db..a774153c 100644
--- a/src/app/main/apps/mail/dialogs/compose/compose.component.ts
+++ b/src/app/main/apps/mail/dialogs/compose/compose.component.ts
@@ -16,11 +16,11 @@ export class MailComposeDialogComponent
     /**
      * Constructor
      *
-     * @param {MatDialogRef<MailComposeDialogComponent>} _matDialogRef
+     * @param {MatDialogRef<MailComposeDialogComponent>} matDialogRef
      * @param _data
      */
     constructor(
-        private _matDialogRef: MatDialogRef<MailComposeDialogComponent>,
+        public matDialogRef: MatDialogRef<MailComposeDialogComponent>,
         @Inject(MAT_DIALOG_DATA) private _data: any
     )
     {
diff --git a/src/app/main/pages/knowledge-base/dialogs/article/article.component.html b/src/app/main/pages/knowledge-base/dialogs/article/article.component.html
index 5a19347c..40895c26 100644
--- a/src/app/main/pages/knowledge-base/dialogs/article/article.component.html
+++ b/src/app/main/pages/knowledge-base/dialogs/article/article.component.html
@@ -11,7 +11,7 @@
     </div>
 
     <div mat-dialog-actions class="m-0 p-16" fxLayout="row" fxLayoutAlign="end center">
-        <button mat-button (click)="_matDialogRef.close()" class="mat-accent" aria-label="Close">
+        <button mat-button (click)="matDialogRef.close()" class="mat-accent" aria-label="Close">
             CLOSE
         </button>
     </div>
diff --git a/src/app/main/pages/knowledge-base/dialogs/article/article.component.ts b/src/app/main/pages/knowledge-base/dialogs/article/article.component.ts
index b0bddc29..60f674c4 100644
--- a/src/app/main/pages/knowledge-base/dialogs/article/article.component.ts
+++ b/src/app/main/pages/knowledge-base/dialogs/article/article.component.ts
@@ -9,10 +9,14 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 })
 export class KnowledgeBaseArticleComponent
 {
-    article: any;
-
+    /**
+     * Constructor
+     *
+     * @param {MatDialogRef<KnowledgeBaseArticleComponent>} matDialogRef
+     * @param _data
+     */
     constructor(
-        private _matDialogRef: MatDialogRef<KnowledgeBaseArticleComponent>,
+        public matDialogRef: MatDialogRef<KnowledgeBaseArticleComponent>,
         @Inject(MAT_DIALOG_DATA) public _data: any
     )
     {