diff --git a/src/app.module.ts b/src/app.module.ts
index ad946407..ea2ed124 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -11,6 +11,7 @@ import { DragulaModule } from 'ng2-dragula/ng2-dragula';
 import { Select2Module } from 'ng2-select2/ng2-select2';
 
 import { AddOnComponent } from './components/add-on';
+import { KeyboardSliderComponent } from './components/keyboard/slider';
 import { KeymapAddComponent, KeymapEditComponent, KeymapHeaderComponent } from './components/keymap';
 import { LayersComponent } from './components/layers';
 import {
@@ -57,7 +58,7 @@ import {
 } from './components/svg/keys';
 import { SvgModuleComponent } from './components/svg/module';
 import { SvgKeyboardWrapComponent } from './components/svg/wrap';
-import { MainAppComponent, appRoutingProviders, routing }  from './main-app';
+import { MainAppComponent, appRoutingProviders, routing } from './main-app';
 
 import { CancelableDirective } from './directives';
 
@@ -126,6 +127,7 @@ const storeConfig = {
         MacroNotFoundComponent,
         AddOnComponent,
         SettingsComponent,
+        KeyboardSliderComponent,
         CancelableDirective
     ],
     imports: [
diff --git a/src/components/keyboard/index.ts b/src/components/keyboard/index.ts
new file mode 100644
index 00000000..eb0742f8
--- /dev/null
+++ b/src/components/keyboard/index.ts
@@ -0,0 +1 @@
+export * from './slider';
diff --git a/src/components/keyboard/slider/index.ts b/src/components/keyboard/slider/index.ts
new file mode 100644
index 00000000..5ea6c5f6
--- /dev/null
+++ b/src/components/keyboard/slider/index.ts
@@ -0,0 +1 @@
+export { KeyboardSliderComponent } from './keyboard-slider.component';
diff --git a/src/components/keyboard/slider/keyboard-slider.component.html b/src/components/keyboard/slider/keyboard-slider.component.html
new file mode 100644
index 00000000..19690d00
--- /dev/null
+++ b/src/components/keyboard/slider/keyboard-slider.component.html
@@ -0,0 +1,6 @@
+<svg-keyboard *ngFor="let layer of layers; trackBy: trackKeyboard"
+                      [@layerState]="layer.animation"
+                      [moduleConfig]="layer.modules"
+                      (keyClick)="keyClick.emit($event)"
+                      (keyHover)="keyHover.emit($event)">
+</svg-keyboard>
\ No newline at end of file
diff --git a/src/components/keyboard/slider/keyboard-slider.component.scss b/src/components/keyboard/slider/keyboard-slider.component.scss
new file mode 100644
index 00000000..5250ea1c
--- /dev/null
+++ b/src/components/keyboard/slider/keyboard-slider.component.scss
@@ -0,0 +1,8 @@
+svg-keyboard {
+    width: 95%;
+    max-width: 1400px;
+    position: absolute;
+    left: 0;
+    transform: translateX(-101%);
+    user-select: none;
+}
diff --git a/src/components/keyboard/slider/keyboard-slider.component.ts b/src/components/keyboard/slider/keyboard-slider.component.ts
new file mode 100644
index 00000000..39e450bb
--- /dev/null
+++ b/src/components/keyboard/slider/keyboard-slider.component.ts
@@ -0,0 +1,101 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    EventEmitter,
+    Input,
+    OnChanges,
+    Output,
+    SimpleChanges,
+    animate,
+    keyframes,
+    state,
+    style,
+    transition,
+    trigger
+} from '@angular/core';
+
+import { Layer } from '../../../config-serializer/config-items/Layer';
+
+@Component({
+    selector: 'keyboard-slider',
+    template: require('./keyboard-slider.component.html'),
+    styles: [require('./keyboard-slider.component.scss')],
+    changeDetection: ChangeDetectionStrategy.Default,
+    // We use 101%, because there was still a trace of the keyboard in the screen when animation was done
+    animations: [
+        trigger('layerState', [
+            state('leftIn, rightIn', style({
+                transform: 'translateX(-50%)',
+                left: '50%'
+            })),
+            state('leftOut', style({
+                transform: 'translateX(-101%)',
+                left: '0'
+            })),
+            state('rightOut', style({
+                transform: 'translateX(0)',
+                left: '101%'
+            })),
+            transition('leftOut => leftIn, rightOut => leftIn', [
+                animate('400ms ease-out', keyframes([
+                    style({ transform: 'translateX(0%)', left: '101%', offset: 0 }),
+                    style({ transform: 'translateX(-50%)', left: '50%', offset: 1 })
+                ]))
+            ]),
+            transition('leftIn => leftOut, rightIn => leftOut', [
+                animate('400ms ease-out', keyframes([
+                    style({ transform: 'translateX(-50%)', left: '50%', offset: 0 }),
+                    style({ transform: 'translateX(-101%)', left: '0%', offset: 1 })
+                ]))
+            ]),
+            transition('* => rightIn', [
+                animate('400ms ease-out', keyframes([
+                    style({ transform: 'translateX(-101%)', left: '0%', offset: 0 }),
+                    style({ transform: 'translateX(-50%)', left: '50%', offset: 1 })
+                ]))
+            ]),
+            transition('* => rightOut', [
+                animate('400ms ease-out', keyframes([
+                    style({ transform: 'translateX(-50%)', left: '50%', offset: 0 }),
+                    style({ transform: 'translateX(0%)', left: '101%', offset: 1 })
+                ]))
+            ]),
+            transition(':leave', [
+                animate('2000ms ease-out', keyframes([
+                    style({ opacity: 1, offset: 0 }),
+                    style({ opacity: 0, offset: 1 })
+                ]))
+            ])
+        ])
+    ]
+})
+export class KeyboardSliderComponent implements OnChanges {
+    @Input() layers: Layer[];
+    @Input() currentLayer: number;
+    @Output() keyClick = new EventEmitter();
+    @Output() keyHover = new EventEmitter();
+
+    ngOnChanges(changes: SimpleChanges) {
+        const layerChange = changes['currentLayer'];
+        if (layerChange) {
+            const prevValue = layerChange.isFirstChange() ? layerChange.currentValue : layerChange.previousValue;
+            this.onLayerChange(prevValue, layerChange.currentValue);
+        }
+    }
+
+    trackKeyboard(index: number) {
+        return index;
+    }
+
+    onLayerChange(oldIndex: number, index: number): void {
+        if (index > oldIndex) {
+            this.layers[oldIndex].animation = 'leftOut';
+            this.layers[index].animation = 'leftIn';
+        } else {
+            this.layers[oldIndex].animation = 'rightOut';
+            this.layers[index].animation = 'rightIn';
+        }
+
+    }
+
+}
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.html b/src/components/svg/wrap/svg-keyboard-wrap.component.html
index 89b7fcc4..f4764794 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.html
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.html
@@ -1,14 +1,9 @@
 <template ngIf="layers">
     <layers [class.disabled]="popoverShown" (select)="selectLayer($event.oldIndex, $event.index)" [current]="currentLayer"></layers>
-    <div class="keyboard-slider">
-        <svg-keyboard *ngFor="let layer of layers; trackBy: trackKeyboard"
-                      [@layerState]="layer.animation"
-                      [moduleConfig]="layer.modules"
-                      (keyClick)="onKeyClick($event.moduleId, $event.keyId, $event.keyTarget)"
-                      (keyHover)="onKeyHover($event.moduleId, $event.event, $event.over, $event.keyId)"
-        >
-        </svg-keyboard>
-    </div>
+    <keyboard-slider [layers]="layers"
+                     [currentLayer]="currentLayer"
+                     (keyClick)="onKeyClick($event.moduleId, $event.keyId, $event.keyTarget)"
+                     (keyHover)="onKeyHover($event.moduleId, $event.event, $event.over, $event.keyId)"></keyboard-slider>
     <popover [visible]="popoverShown" [keyPosition]="keyPosition" [wrapPosition]="wrapPosition" [defaultKeyAction]="popoverInitKeyAction" [currentKeymap]="keymap" (cancel)="hidePopover()" (remap)="onRemap($event)"></popover>
     <div class="tooltip bottom"
          [class.in]="tooltipData.show"
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.scss b/src/components/svg/wrap/svg-keyboard-wrap.component.scss
index 72abb6b3..1bf6faaa 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.scss
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.scss
@@ -7,22 +7,15 @@
     }
 }
 
-svg-keyboard {
-    width: 95%;
-    max-width: 1400px;
-    position: absolute;
-    left: 0;
-    transform: translateX(-101%);
-    user-select: none;
-}
-
-.keyboard-slider {
+keyboard-slider {
+    display: block;
     position: relative;
     overflow: hidden;
     /* TODO create dynamic */
     height: 500px;
     margin-top: 30px;
 }
+
 .tooltip {
     position: fixed;
     transform: translate(-50%, -6px);
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index 5048c2d7..0374f502 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -7,13 +7,7 @@ import {
     Input,
     OnChanges,
     OnInit,
-    SimpleChanges,
-    animate,
-    keyframes,
-    state,
-    style,
-    transition,
-    trigger
+    SimpleChanges
 } from '@angular/core';
 
 import { Store } from '@ngrx/store';
@@ -42,48 +36,7 @@ import { KeymapActions } from '../../../store/actions';
     selector: 'svg-keyboard-wrap',
     template: require('./svg-keyboard-wrap.component.html'),
     styles: [require('./svg-keyboard-wrap.component.scss')],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-    // We use 101%, because there was still a trace of the keyboard in the screen when animation was done
-    animations: [
-        trigger('layerState', [
-            state('leftIn, rightIn', style({
-                transform: 'translateX(-50%)',
-                left: '50%'
-            })),
-            state('leftOut', style({
-                transform: 'translateX(-101%)',
-                left: '0'
-            })),
-            state('rightOut', style({
-                transform: 'translateX(0)',
-                left: '101%'
-            })),
-            transition('leftOut => leftIn, rightOut => leftIn', [
-                animate('400ms ease-out', keyframes([
-                    style({ transform: 'translateX(0%)', left: '101%', offset: 0 }),
-                    style({ transform: 'translateX(-50%)', left: '50%', offset: 1 })
-                ]))
-            ]),
-            transition('leftIn => leftOut, rightIn => leftOut', [
-                animate('400ms ease-out', keyframes([
-                    style({ transform: 'translateX(-50%)', left: '50%', offset: 0 }),
-                    style({ transform: 'translateX(-101%)', left: '0%', offset: 1 })
-                ]))
-            ]),
-            transition('* => rightIn', [
-                animate('400ms ease-out', keyframes([
-                    style({ transform: 'translateX(-101%)', left: '0%', offset: 0 }),
-                    style({ transform: 'translateX(-50%)', left: '50%', offset: 1 })
-                ]))
-            ]),
-            transition('* => rightOut', [
-                animate('400ms ease-out', keyframes([
-                    style({ transform: 'translateX(-50%)', left: '50%', offset: 0 }),
-                    style({ transform: 'translateX(0%)', left: '101%', offset: 1 })
-                ]))
-            ])
-        ])
-    ]
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SvgKeyboardWrapComponent implements OnInit, OnChanges {
     @Input() keymap: Keymap;
@@ -324,4 +277,5 @@ export class SvgKeyboardWrapComponent implements OnInit, OnChanges {
     trackKeyboard(index: number) {
         return index;
     }
+
 }