diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts
index a3317f67..36d28bc4 100644
--- a/frontend/app/app.module.ts
+++ b/frontend/app/app.module.ts
@@ -68,6 +68,7 @@ export class GoogleMapsConfig {
   }
 }
 
+@Injectable()
 export class MyHammerConfig extends HammerGestureConfig {
   overrides = <any>{
     'swipe': {direction: 31} // enable swipe up
diff --git a/frontend/app/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css b/frontend/app/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css
index 78920589..93234a78 100644
--- a/frontend/app/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css
+++ b/frontend/app/gallery/grid/photo/loading/loading.photo.grid.gallery.component.css
@@ -7,8 +7,9 @@
 }
 
 .static span {
-  top: calc(50% - 25px);
+  top: calc(50% - 61px);
   left: calc(50% - 25px);
+  margin-top: 36px;
 }
 
 .sk-cube-grid {
diff --git a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.css b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.css
index 3fcb97ad..b322444f 100644
--- a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.css
+++ b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.css
@@ -52,6 +52,7 @@ img {
   background-color: transparent;
   color: white;
   font-size: medium;
+  display: table-caption;
   position: relative;
   padding: 5px;
   margin-top: 0;
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 eb4d60bf..0e130245 100644
--- a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
+++ b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.html
@@ -11,7 +11,8 @@
   <div #info class="info"
        *ngIf="infoBar.visible"
        [style.margin-top.px]="infoBar.marginTop"
-       [style.background]="infoBar.background">
+       [style.background]="infoBar.background"
+       [style.width.px]="container.nativeElement.offsetWidth">
     <div class="photo-name">{{gridPhoto.photo.name}}</div>
 
     <div class="photo-position" *ngIf="gridPhoto.photo.metadata.positionData">
diff --git a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.ts b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.ts
index 19c7b28f..e5953934 100644
--- a/frontend/app/gallery/grid/photo/photo.grid.gallery.component.ts
+++ b/frontend/app/gallery/grid/photo/photo.grid.gallery.component.ts
@@ -102,14 +102,19 @@ export class GalleryPhotoComponent implements IRenderable, OnInit, OnDestroy {
   }
 
   mouseOut() {
-    this.infoBar.marginTop = 0;
-    this.infoBar.background = 'rgba(0,0,0,0.0)';
     if (this.animationTimer != null) {
       clearTimeout(this.animationTimer);
     }
     this.animationTimer = setTimeout(() => {
-      this.infoBar.visible = false;
-    }, 500);
+      this.infoBar.marginTop = 0;
+      this.infoBar.background = 'rgba(0,0,0,0.0)';
+      if (this.animationTimer != null) {
+        clearTimeout(this.animationTimer);
+      }
+      this.animationTimer = setTimeout(() => {
+        this.infoBar.visible = false;
+      }, 500);
+    }, 100);
 
   }
 
diff --git a/frontend/app/login/login.component.html b/frontend/app/login/login.component.html
index 857dd429..bbd4cca3 100644
--- a/frontend/app/login/login.component.html
+++ b/frontend/app/login/login.component.html
@@ -5,7 +5,6 @@
   <div class="row title">
     <h1><img src="assets/icon.png"/>{{title}}</h1>
   </div>
-
   <div class="row card">
     <div class="col-md-12">
       <h1 i18n>Please log in</h1>
diff --git a/frontend/main.ts b/frontend/main.ts
index 1a175d9e..d4d307db 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -1,7 +1,7 @@
-import {platformBrowserDynamic} from "@angular/platform-browser-dynamic";
-import {enableProdMode} from "@angular/core";
-import {environment} from "./environments/environment";
-import {AppModule} from "./app/app.module";
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {enableProdMode} from '@angular/core';
+import {environment} from './environments/environment';
+import {AppModule} from './app/app.module';
 
 if (environment.production) {
   enableProdMode();
diff --git a/frontend/tsconfig.spec.json b/frontend/tsconfig.spec.json
index 510e3f1f..15458edb 100644
--- a/frontend/tsconfig.spec.json
+++ b/frontend/tsconfig.spec.json
@@ -11,7 +11,8 @@
     ]
   },
   "files": [
-    "test.ts"
+    "test.ts",
+    "polyfills.ts"
   ],
   "include": [
     "**/*.spec.ts",
diff --git a/package.json b/package.json
index 1ba20336..a728cf1b 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "ng": "ng",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "build-hu": "ng build --aot --output-path=./dist/hu --locale hu --i18n-format xlf --i18n-file frontend/locale/messages.hu.xlf --missing-translation warning",
+    "run-dev": "ng build --aot -w --output-path=./dist --locale en --i18n-format xlf --i18n-file frontend/translate/messages.en.xlf --missing-translation warning",
+    "build-hu": "ng build --aot --output-path=./dist/hu --locale hu --i18n-format xlf --i18n-file frontend/translate/messages.hu.xlf --missing-translation warning",
     "update-translation": "gulp update-translation",
     "add-translation": "gulp add-translation"
   },
@@ -42,7 +43,7 @@
     "ts-exif-parser": "0.1.23",
     "ts-node-iptc": "1.0.9",
     "typeconfig": "1.0.6",
-    "typeorm": "0.2.4",
+    "typeorm": "0.2.5",
     "winston": "2.4.2"
   },
   "devDependencies": {