diff --git a/src/app/theme/sidebar/sidebar.component.ts b/src/app/theme/sidebar/sidebar.component.ts
index 3aa8c1e6..b3cc07c6 100644
--- a/src/app/theme/sidebar/sidebar.component.ts
+++ b/src/app/theme/sidebar/sidebar.component.ts
@@ -49,28 +49,18 @@ export class Sidebar {
     if (this.isMenuCollapsed) {
       this.menuExpand();
       if (!item.expanded) {
-        setTimeout(function () {
-          item.expanded = !item.expanded;
-
-          // TODO: incomplete
-          // submenu.slideToggle();
-        }, 0);
+        item.expanded = !item.expanded;
+        submenu.slideToggle();
       }
     } else {
       item.expanded = !item.expanded;
-
-      // TODO: incomplete
-      // submenu.slideToggle();
+      submenu.slideToggle();
     }
     return false;
   }
 
-  private isActive(instruction: any[]): boolean {
-    return ;
-  }
-
   private selectMenuItem() {
-    let isCurrent = (instruction) => (this.router.isRouteActive(this.router.generate([instruction])));
+    let isCurrent = (instruction) => (instruction ? this.router.isRouteActive(this.router.generate([instruction])): false);
 
     this.menuItems.forEach(function (menu) {
 
diff --git a/src/app/theme/sidebar/sidebar.html b/src/app/theme/sidebar/sidebar.html
index 63d78207..896d499b 100644
--- a/src/app/theme/sidebar/sidebar.html
+++ b/src/app/theme/sidebar/sidebar.html
@@ -7,21 +7,21 @@
         <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
       </a>
 
-      <a *ngIf="item.subMenu" ng-mouseenter="hoverItem($event, item)" (click)="toggleSubMenu($event, item)" class="al-sidebar-list-link" href>
+      <a *ngIf="item.subMenu" ng-mouseenter="hoverItem($event, item)" (click)="toggleSubMenu($event, item)" class="al-sidebar-list-link">
         <i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
         <b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}" *ngIf="item.subMenu"></b>
       </a>
 
       <ul *ngIf="item.subMenu" class="al-sidebar-sublist"
-          ngClass="{expanded: item.expanded, 'slide-right': item.slideRight}">
-        <li *ngFor="#subitem of item.subMenu" ngClass="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
+          [ngClass]="{expanded: item.expanded, 'slide-right': item.slideRight}">
+        <li *ngFor="#subitem of item.subMenu" [ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
           <a ng-mouseenter="hoverItem($event, item)" *ngIf="subitem.subMenu" (click)="toggleSubMenu($event, subitem);"
              class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span>
-            <b class="fa" *ngIf="subitem.subMenu" ngClass="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b>
+            <b class="fa" *ngIf="subitem.subMenu" [ngClass]="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b>
           </a>
           <ul *ngIf="subitem.subMenu" class="al-sidebar-sublist subitem-submenu-list"
-              ngClass="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}">
-            <li *ngFor="#subSubitem of subitem.subMenu" ng-mouseenter="hoverItem($event, item)" ngClass="{selected: subitem.selected}">
+              [ngClass]="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}">
+            <li *ngFor="#subSubitem of subitem.subMenu" ng-mouseenter="hoverItem($event, item)" [ngClass]="{selected: subitem.selected}">
               <a  ng-mouseenter="hoverItem($event, item)" [routerLink]="[subSubitem.name]">
                 {{ subSubitem.title }}</a>
             </li>
diff --git a/src/app/theme/sidebar/sidebar.service.ts b/src/app/theme/sidebar/sidebar.service.ts
index a1a2df6f..b1ef4de2 100644
--- a/src/app/theme/sidebar/sidebar.service.ts
+++ b/src/app/theme/sidebar/sidebar.service.ts
@@ -39,13 +39,17 @@ export class SidebarService {
       subMenu: [
         {
           title: 'Menu Level 1.1',
-          disabled: true
+          disabled: true,
+          selected: false,
+          expanded: false
         },
         {
           title: 'Menu Level 1.2',
           subMenu: [{
             title: 'Menu Level 1.2.1',
-            disabled: true
+            disabled: true,
+            selected: false,
+            expanded: false
           }]
         }
       ]