diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts
index 1604e84a3..7c3a31adc 100644
--- a/projects/aca-content/src/lib/aca-content.module.ts
+++ b/projects/aca-content/src/lib/aca-content.module.ts
@@ -43,7 +43,7 @@ import {
   LibraryStatusColumnComponent,
   TrashcanNameColumnComponent
 } from '@alfresco/adf-content-services';
-import { DocumentBasePageService, ExtensionsDataLoaderGuard, RouterExtensionService, SharedModule } from '@alfresco/aca-shared';
+import { DocumentBasePageService, ExtensionsDataLoaderGuard, PageLayoutModule, RouterExtensionService, SharedModule } from '@alfresco/aca-shared';
 import * as rules from '@alfresco/aca-shared/rules';
 
 import { FilesComponent } from './components/files/files.component';
@@ -62,7 +62,6 @@ import { AppToolbarModule } from './components/toolbar/toolbar.module';
 import { AppCreateMenuModule } from './components/create-menu/create-menu.module';
 import { AppSidenavModule } from './components/sidenav/sidenav.module';
 import { AppCommonModule } from './components/common/common.module';
-import { AppLayoutModule } from './components/layout/layout.module';
 import { AppSearchInputModule } from './components/search/search-input.module';
 import { DocumentListCustomComponentsModule } from './components/dl-custom-components/document-list-custom-components.module';
 import { AppSearchResultsModule } from './components/search/search-results.module';
@@ -119,7 +118,7 @@ import { TagsColumnComponent } from './components/dl-custom-components/tags-colu
 import { UserInfoComponent } from './components/common/user-info/user-info.component';
 import { AppHeaderActionsModule } from './components/header-actions/header-actions.module';
 import { SidenavComponent } from './components/sidenav/sidenav.component';
-import { ShellLayoutComponent } from '@alfresco/adf-core/shell';
+import { ShellLayoutComponent, SHELL_NAVBAR_MIN_WIDTH } from '@alfresco/adf-core/shell';
 
 registerLocaleData(localeFr);
 registerLocaleData(localeDe);
@@ -152,7 +151,7 @@ registerLocaleData(localeSv);
     MaterialModule,
     AppStoreModule,
     AppCommonModule,
-    AppLayoutModule,
+    PageLayoutModule,
     DirectivesModule,
     ContextMenuModule,
     AppInfoDrawerModule,
@@ -193,7 +192,8 @@ registerLocaleData(localeSv);
         name: 'app',
         source: 'assets'
       }
-    }
+    },
+    { provide: SHELL_NAVBAR_MIN_WIDTH, useValue: 0 }
   ]
 })
 export class ContentServiceExtensionModule {
diff --git a/projects/aca-content/src/lib/components/header-actions/header-actions.module.ts b/projects/aca-content/src/lib/components/header-actions/header-actions.module.ts
index 8205ec9c1..0ee61d2c9 100644
--- a/projects/aca-content/src/lib/components/header-actions/header-actions.module.ts
+++ b/projects/aca-content/src/lib/components/header-actions/header-actions.module.ts
@@ -31,10 +31,10 @@ import { AppCommonModule } from '../common/common.module';
 import { AppToolbarModule } from '../toolbar/toolbar.module';
 import { DirectivesModule } from '../../directives/directives.module';
 import { ContextMenuModule } from '../context-menu/context-menu.module';
-import { AppLayoutModule } from '../layout/layout.module';
 import { AppSearchInputModule } from '../search/search-input.module';
 import { HeaderActionsComponent } from './header-actions.component';
 import { MainActionModule } from '../main-action/main-action.module';
+import { PageLayoutModule } from '@alfresco/aca-shared';
 
 @NgModule({
   imports: [
@@ -45,7 +45,7 @@ import { MainActionModule } from '../main-action/main-action.module';
     AppCommonModule,
     AppToolbarModule,
     ContextMenuModule,
-    AppLayoutModule,
+    PageLayoutModule,
     AppSearchInputModule,
     MainActionModule
   ],
diff --git a/projects/aca-content/src/lib/components/layout/layout.module.ts b/projects/aca-content/src/lib/components/layout/layout.module.ts
deleted file mode 100644
index 1ebd7cae2..000000000
--- a/projects/aca-content/src/lib/components/layout/layout.module.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- * @license
- * Alfresco Example Content Application
- *
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { SHELL_NAVBAR_MIN_WIDTH } from '@alfresco/adf-core/shell';
-import { ContentModule } from '@alfresco/adf-content-services';
-import { RouterModule } from '@angular/router';
-import { AppSidenavModule } from '../sidenav/sidenav.module';
-import { AppCommonModule } from '../common/common.module';
-import { HttpClientModule } from '@angular/common/http';
-import { PageLayoutModule } from '@alfresco/aca-shared';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    RouterModule,
-    CoreModule.forChild(),
-    ContentModule.forChild(),
-    AppCommonModule,
-    AppSidenavModule,
-    HttpClientModule,
-    PageLayoutModule
-  ],
-  exports: [PageLayoutModule],
-  providers: [{ provide: SHELL_NAVBAR_MIN_WIDTH, useValue: 0 }]
-})
-export class AppLayoutModule {}
diff --git a/projects/aca-content/src/lib/components/search/search-results.module.ts b/projects/aca-content/src/lib/components/search/search-results.module.ts
index 93c41d1b9..266657e46 100644
--- a/projects/aca-content/src/lib/components/search/search-results.module.ts
+++ b/projects/aca-content/src/lib/components/search/search-results.module.ts
@@ -27,7 +27,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CoreModule } from '@alfresco/adf-core';
 import { ContentModule } from '@alfresco/adf-content-services';
-import { LockedByModule } from '@alfresco/aca-shared';
+import { LockedByModule, PageLayoutModule } from '@alfresco/aca-shared';
 import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchResultsRowComponent } from './search-results-row/search-results-row.component';
 import { SearchLibrariesResultsComponent } from './search-libraries-results/search-libraries-results.component';
@@ -35,7 +35,6 @@ import { AppInfoDrawerModule } from '../info-drawer/info.drawer.module';
 import { AppToolbarModule } from '../toolbar/toolbar.module';
 import { AppCommonModule } from '../common/common.module';
 import { DirectivesModule } from '../../directives/directives.module';
-import { AppLayoutModule } from '../layout/layout.module';
 import { ContextMenuModule } from '../context-menu/context-menu.module';
 import { SearchActionMenuComponent } from './search-action-menu/search-action-menu.component';
 import { DocumentListCustomComponentsModule } from '../dl-custom-components/document-list-custom-components.module';
@@ -51,7 +50,7 @@ import { AppHeaderActionsModule } from '../header-actions/header-actions.module'
     AppInfoDrawerModule,
     AppToolbarModule,
     DirectivesModule,
-    AppLayoutModule,
+    PageLayoutModule,
     ContextMenuModule,
     LockedByModule,
     DocumentListCustomComponentsModule,
diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts
index 97e6aecb9..d77b4d905 100644
--- a/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts
+++ b/projects/aca-content/src/lib/components/trashcan/trashcan.module.ts
@@ -32,9 +32,9 @@ import { AppCommonModule } from '../common/common.module';
 import { AppToolbarModule } from '../toolbar/toolbar.module';
 import { DirectivesModule } from '../../directives/directives.module';
 import { ContextMenuModule } from '../context-menu/context-menu.module';
-import { AppLayoutModule } from '../layout/layout.module';
 import { AppSearchInputModule } from '../search/search-input.module';
 import { AppHeaderActionsModule } from '../header-actions/header-actions.module';
+import { PageLayoutModule } from '@alfresco/aca-shared';
 
 @NgModule({
   imports: [
@@ -45,7 +45,7 @@ import { AppHeaderActionsModule } from '../header-actions/header-actions.module'
     AppCommonModule,
     AppToolbarModule,
     ContextMenuModule,
-    AppLayoutModule,
+    PageLayoutModule,
     AppSearchInputModule,
     AppHeaderActionsModule
   ],