diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts
index 16e2693843..22d3ae1763 100644
--- a/demo-shell/src/app/app.routes.ts
+++ b/demo-shell/src/app/app.routes.ts
@@ -39,7 +39,6 @@ import { SocialComponent } from './components/social/social.component';
 import { FilesComponent } from './components/files/files.component';
 import { FormComponent } from './components/form/form.component';
 
-import { UploadButtonComponent } from '@alfresco/adf-content-services';
 import { FileViewComponent } from './components/file-view/file-view.component';
 import { CustomSourcesComponent } from './components/files/custom-sources.component';
 import { FormListComponent } from './components/form/form-list.component';
@@ -80,13 +79,19 @@ export const appRoutes: Routes = [
             },
             {
                 path: 'files',
-                redirectTo: 'files/-my-'
+                component: FilesComponent,
+                canActivate: [AuthGuardEcm]
             },
             {
                 path: 'files/:id',
                 component: FilesComponent,
                 canActivate: [AuthGuardEcm]
             },
+            {
+                path: 'files/:id/display/:mode',
+                component: FilesComponent,
+                canActivate: [AuthGuardEcm]
+            },
             {
                 path: 'dl-custom-sources',
                 component: CustomSourcesComponent,
@@ -96,11 +101,6 @@ export const appRoutes: Routes = [
                 path: 'datatable',
                 component: DataTableComponent
             },
-            {
-                path: 'uploader',
-                component: UploadButtonComponent,
-                canActivate: [AuthGuardEcm]
-            },
             {
                 path: 'search',
                 component: SearchResultComponent,
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.scss b/demo-shell/src/app/components/app-layout/app-layout.component.scss
index 54fb3211e2..451ee1d263 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.scss
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.scss
@@ -19,7 +19,7 @@
    }
 
    .adf-app-layout-toolbar {
-       z-index: 200000;
+       z-index: 1001;
        position: relative;
        overflow: visible !important;
    }
diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.ts b/demo-shell/src/app/components/app-layout/app-layout.component.ts
index 5acdea2a0c..c1cf9ade45 100644
--- a/demo-shell/src/app/components/app-layout/app-layout.component.ts
+++ b/demo-shell/src/app/components/app-layout/app-layout.component.ts
@@ -39,7 +39,6 @@ export class AppLayoutComponent {
         { href: '/form', icon: 'poll', title: 'APP_LAYOUT.FORM' },
         { href: '/form-list', icon: 'library_books', title: 'APP_LAYOUT.FORM_LIST' },
         { href: '/form-loading', icon: 'cached', title: 'APP_LAYOUT.FORM_LOADING' },
-        { href: '/uploader', icon: 'file_upload', title: 'APP_LAYOUT.UPLOADER' },
         { href: '/webscript', icon: 'extension', title: 'APP_LAYOUT.WEBSCRIPT' },
         { href: '/tag', icon: 'local_offer', title: 'APP_LAYOUT.TAG' },
         { href: '/social', icon: 'thumb_up', title: 'APP_LAYOUT.SOCIAL' },
diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 2de698f8f4..a98e66a05e 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -252,7 +252,7 @@
                     </data-column>
                     <data-column
                         title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}"
-                        key="createdByUser?.displayName"
+                        key="createdByUser.displayName"
                         class="desktop-only">
                     </data-column>
                     <data-column
diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
index 2561daf4b3..f42ff3cd67 100644
--- a/demo-shell/src/app/components/files/files.component.ts
+++ b/demo-shell/src/app/components/files/files.component.ts
@@ -19,6 +19,8 @@ import {
     Component, Input, OnInit, OnChanges, OnDestroy, Optional,
     EventEmitter, ViewChild, SimpleChanges, Output
 } from '@angular/core';
+import { Location } from '@angular/common';
+
 import { MatDialog } from '@angular/material';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry } from 'alfresco-js-api';
@@ -155,6 +157,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
                 private uploadService: UploadService,
                 private contentService: ContentService,
                 private dialog: MatDialog,
+                private location: Location,
                 private translateService: TranslationService,
                 private router: Router,
                 private logService: LogService,
@@ -194,6 +197,10 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
                 if (params['id'] && this.currentFolderId !== params['id']) {
                     this.currentFolderId = params['id'];
                 }
+
+                if (params['mode']) {
+                    this.displayMode = DisplayMode.Gallery;
+                }
             });
         }
 
@@ -273,7 +280,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     onFolderChange($event) {
-       this.router.navigate(['/files', $event.value.id]);
+        this.router.navigate(['/files', $event.value.id]);
     }
 
     handlePermissionError(event: any) {
@@ -459,10 +466,17 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     toogleGalleryView(): void {
+        const url = this
+            .router
+            .createUrlTree(['/files', this.currentFolderId, 'display', this.displayMode])
+            .toString();
+
         if (this.displayMode === DisplayMode.List) {
             this.displayMode = DisplayMode.Gallery;
+            this.location.go(url);
         } else {
             this.displayMode = DisplayMode.List;
+            this.location.go(url);
         }
     }
 }
diff --git a/lib/core/pagination/infinite-pagination.component.ts b/lib/core/pagination/infinite-pagination.component.ts
index cd9733c3d6..bebb295e87 100644
--- a/lib/core/pagination/infinite-pagination.component.ts
+++ b/lib/core/pagination/infinite-pagination.component.ts
@@ -92,6 +92,10 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
         this.pagination.merge = true;
         this.loadMore.next(this.pagination);
 
+        if ((this.pagination.skipCount + this.pageSize) > this.pagination.totalItems) {
+            this.pagination.hasMoreItems = false;
+        }
+
         if (this.target) {
             this.target.pagination.value.merge = this.pagination.merge;
             this.target.pagination.value.skipCount = this.pagination.skipCount;