diff --git a/src/app/config.ts b/src/app/config.ts
index 054b657..001e19a 100644
--- a/src/app/config.ts
+++ b/src/app/config.ts
@@ -1,11 +1,13 @@
 export const config = {
   dashboard: {
     route: 'dashboard',
-    currentLayout: 'terminal-ide-web',
+    currentLayout: 'ide-only',
     enabledLayouts:  new Set([
       'terminal-ide-web',
       'terminal-web',
-      'web-only'
+      'terminal-only',
+      'web-only',
+      'ide-only'
       ]),
     allLayouts:  new Set([
       'terminal-ide-web',
diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index 376d504..80709b0 100755
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -17,7 +17,7 @@
         <app-terminal></app-terminal>
     </div>
     <div class="tfw-sidebar">
-      <app-sidebar></app-sidebar>
+      <app-sidebar [layout]="layout"></app-sidebar>
     </div>
 
     <div class="tfw-terminal-footer"></div>
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index bd56bca..3958a44 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -33,7 +33,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
   }
 
   layoutHandler(data: LayoutCommand) {
-    if (data.layout in (this.enabledLayouts)) {
+    if (this.enabledLayouts.has(data.layout)) {
       this.layout = data.layout;
     }
     else {
diff --git a/src/app/sidebar/sidebar.component.html b/src/app/sidebar/sidebar.component.html
index 78bb2c1..d9b903c 100755
--- a/src/app/sidebar/sidebar.component.html
+++ b/src/app/sidebar/sidebar.component.html
@@ -1,4 +1,4 @@
 <div class="tfw-ide-pin" *ngFor="let layoutIter of enabledLayouts">
-  <div *ngIf="layout === layoutIter"><img src="images/{{layoutIter}}_active.svg"></div>
+  <div *ngIf="layout === layoutIter"><img class="active" src="images/{{layoutIter}}_active.svg"></div>
   <div *ngIf="layout !== layoutIter"><img src="images/{{layoutIter}}.svg"></div>
 </div>
diff --git a/src/app/sidebar/sidebar.component.scss b/src/app/sidebar/sidebar.component.scss
index 8f27e70..7ed5e9a 100755
--- a/src/app/sidebar/sidebar.component.scss
+++ b/src/app/sidebar/sidebar.component.scss
@@ -8,7 +8,9 @@ img {
 }
 
 .tfw-ide-pin {
-
   cursor: pointer;
 
+  & .active {
+    box-shadow: 0 4px 8px 0 rgba($tao-blue-500, 0.1), 0 4px 10px 0 rgba($tao-blue-500, 0.09);
+  }
 }
diff --git a/src/app/sidebar/sidebar.component.ts b/src/app/sidebar/sidebar.component.ts
index 86fe3fd..77f8e8b 100644
--- a/src/app/sidebar/sidebar.component.ts
+++ b/src/app/sidebar/sidebar.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { config } from '../config';
 
 @Component({
@@ -8,9 +8,10 @@ import { config } from '../config';
 })
 
 export class SidebarComponent implements OnInit {
-  layout: string = config.dashboard.currentLayout;
+  @Input() layout: string;
   enabledLayouts: Set<string> = config.dashboard.enabledLayouts;
   constructor() {}
   ngOnInit() {
   }
+
 }
diff --git a/src/assets/scss/mixins/_layout.scss b/src/assets/scss/mixins/_layout.scss
index 10fe056..4595386 100644
--- a/src/assets/scss/mixins/_layout.scss
+++ b/src/assets/scss/mixins/_layout.scss
@@ -105,7 +105,10 @@ $layouts: (
   @each $k, $v in $map {
     #{$sel}#{$k} {
       @if (length($v) == 0) {
-        display: none
+        // We need to make sure the DOM element is displayed but not visible
+        visibility: hidden;
+        position: absolute;
+        z-index: -10000000;
       }
       @else {
         grid-column-start: nth($v, 1);