diff --git a/frontend/app/gallery/grid/grid.gallery.component.ts b/frontend/app/gallery/grid/grid.gallery.component.ts
index f66bb4dd..553386ca 100644
--- a/frontend/app/gallery/grid/grid.gallery.component.ts
+++ b/frontend/app/gallery/grid/grid.gallery.component.ts
@@ -40,6 +40,8 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit {
     private MIN_ROW_COUNT = 2;
     private MAX_ROW_COUNT = 5;
 
+    onScrollFired = false;
+
     constructor() {
     }
 
@@ -125,7 +127,7 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit {
 
     private renderedPhotoIndex:number = 0;
 
-    private renderPhotos() {
+    private renderPhotos() { 
         if (this.containerWidth == 0 || this.renderedPhotoIndex >= this.photos.length || !this.shouldRenderMore()) {
             return;
         }
@@ -134,8 +136,11 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit {
         let renderedContentHeight = 0;
 
         while (this.renderedPhotoIndex < this.photos.length && this.shouldRenderMore(renderedContentHeight) === true) {
-            renderedContentHeight += this.renderARow();
-
+            let ret = this.renderARow();
+            if (ret === null) {
+                throw new Error("Gridphotos rendering failed");
+            }
+            renderedContentHeight += ret;
         }
     }
 
@@ -148,27 +153,34 @@ export class GalleryGridComponent implements OnChanges,AfterViewInit {
      */
     private shouldRenderMore(offset:number = 0):boolean {
         return Config.Client.enableOnScrollRendering === false ||
-            document.body.scrollTop >= (document.body.clientHeight + offset - window.innerHeight) * 0.7
+            window.scrollY >= (document.body.clientHeight + offset - window.innerHeight) * 0.7
             || (document.body.clientHeight + offset) * 0.85 < window.innerHeight;
 
     }
 
+
     @HostListener('window:scroll')
     onScroll() {
-        this.renderPhotos();
+        if (!this.onScrollFired) {
+            window.requestAnimationFrame(() => {
+                this.renderPhotos();
 
-        if (Config.Client.enableOnScrollThumbnailPrioritising === true) {
-            this.gridPhotoQL.toArray().forEach((pc:GalleryPhotoComponent) => {
-                pc.onScroll();
+                if (Config.Client.enableOnScrollThumbnailPrioritising === true) {
+                    this.gridPhotoQL.toArray().forEach((pc:GalleryPhotoComponent) => {
+                        pc.onScroll();
+                    });
+                }
+                this.onScrollFired = false;
             });
+            this.onScrollFired = true;
         }
     }
 
     public renderARow():number {
-        if (this.renderedPhotoIndex + 1 >= this.photos.length) {
-            return 0;
+        if (this.renderedPhotoIndex >= this.photos.length) {
+            return null;
         }
-        
+
         let maxRowHeight = window.innerHeight / this.MIN_ROW_COUNT;
         let minRowHeight = window.innerHeight / this.MAX_ROW_COUNT;
 
diff --git a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
index a824c70a..210de9be 100644
--- a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
+++ b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
@@ -19,7 +19,6 @@
                 <span *ngIf="!searchEnabled">{{getPositionText()}}</span>
             </template>
         </div>
-        {{gridPhoto.photo.metadata.creationDate | date:"yy-MM-dd HH:mm:ss"}}
 
         <div class="photo-keywords">
             <template ngFor let-keyword [ngForOf]="gridPhoto.photo.metadata.keywords" let-last="last">
diff --git a/frontend/app/gallery/lightbox/lightbox.gallery.component.ts b/frontend/app/gallery/lightbox/lightbox.gallery.component.ts
index e355916e..fb0fa4eb 100644
--- a/frontend/app/gallery/lightbox/lightbox.gallery.component.ts
+++ b/frontend/app/gallery/lightbox/lightbox.gallery.component.ts
@@ -107,12 +107,12 @@ export class GalleryLightboxComponent {
     }
 
 
-    private getBodyScrollTop() {
-        return this.dom.getProperty(this.dom.query('body'), 'scrollTop');
+    private getBodyScrollTop():number {
+        return window.scrollY;
     }
 
-    private setBodyScrollTop(value) {
-        return this.dom.setProperty(this.dom.query('body'), 'scrollTop', value);
+    private setBodyScrollTop(value:number) {
+        window.scrollTo(window.scrollX, value);
     }
 
     private getScreenWidth() {