diff --git a/demo/src/app/common/tool/tool.component.ts b/demo/src/app/common/tool/tool.component.ts
index 054041637a..7e14b8d3ef 100644
--- a/demo/src/app/common/tool/tool.component.ts
+++ b/demo/src/app/common/tool/tool.component.ts
@@ -9,6 +9,7 @@ import {
 
 import { BehaviorSubject } from 'rxjs';
 
+import { LanguageService } from '@igo2/core';
 import {
   OnUpdateInputs,
   Tool,
@@ -18,7 +19,7 @@ import {
 } from '@igo2/common';
 
 @ToolComponent({
-  name: 'salutation',
+  name: 'demo-salutation',
   title: 'Salutation',
   icon: 'person',
   options: {name: 'Jack'}
@@ -43,7 +44,7 @@ export class AppSalutationToolComponent implements OnUpdateInputs {
 }
 
 @ToolComponent({
-  name: 'about',
+  name: 'demo-about',
   title: 'About',
   icon: 'info'
 })
@@ -73,10 +74,13 @@ export class AppToolComponent implements OnInit, OnDestroy {
     return this.activeTool$.value ? this.activeTool$.value.title : 'Toolbox';
   }
 
-  constructor(private toolService: ToolService) {}
+  constructor(
+    private toolService: ToolService,
+    private languageService: LanguageService
+  ) {}
 
   ngOnInit() {
-    this.toolbox.setToolbar(['salutation', 'about']);
+    this.toolbox.setToolbar(['demo-salutation', 'demo-about']);
     this.toolbox.setTools(this.toolService.getTools());
   }
 
@@ -85,7 +89,7 @@ export class AppToolComponent implements OnInit, OnDestroy {
   }
 
   activateSalutationTool() {
-    this.toolbox.activateTool('salutation', {name: 'Bob'});
+    this.toolbox.activateTool('demo-salutation', {name: 'Bob'});
   }
 
 }
diff --git a/demo/src/app/common/tool/tool.module.ts b/demo/src/app/common/tool/tool.module.ts
index e2d7c39191..d96e72531f 100644
--- a/demo/src/app/common/tool/tool.module.ts
+++ b/demo/src/app/common/tool/tool.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule, MatIconModule, MatCardModule } from '@angular/material';
 
+import { IgoLanguageModule } from '@igo2/core';
 import { IgoPanelModule, IgoToolModule } from '@igo2/common';
 
 import {
@@ -23,6 +24,7 @@ import { AppToolRoutingModule } from './tool-routing.module';
     MatButtonModule,
     MatIconModule,
     MatCardModule,
+    IgoLanguageModule,
     IgoPanelModule,
     IgoToolModule.forRoot()
   ],
diff --git a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.scss b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.scss
index 9aade0ea31..d4b234700f 100644
--- a/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.scss
+++ b/packages/common/src/lib/dynamic-component/dynamic-outlet/dynamic-outlet.component.scss
@@ -1,6 +1,5 @@
 :host {
   display: block;
-  overflow: hidden;
   width: 100%;
   height: 100%;
 }
diff --git a/packages/common/src/lib/tool/toolbox/toolbox.component.scss b/packages/common/src/lib/tool/toolbox/toolbox.component.scss
index c613a6c789..251ed3899b 100644
--- a/packages/common/src/lib/tool/toolbox/toolbox.component.scss
+++ b/packages/common/src/lib/tool/toolbox/toolbox.component.scss
@@ -45,3 +45,7 @@ igo-actionbar:not(.with-title) {
 igo-actionbar ::ng-deep igo-list {
   overflow: inherit;
 }
+
+igo-dynamic-outlet {
+  overflow: auto;
+}