diff --git a/deploy.php b/deploy.php
index 2b26e00..927d3eb 100644
--- a/deploy.php
+++ b/deploy.php
@@ -20,8 +20,6 @@ host('alfheim.ragnarok.yvan.hu')
     ->stage('production')
     ->user('yvan')
     ->forwardAgent()
-//    ->set('ng_target', 'production')
-//    ->set('ng_environment', 'prod')
     ->set('env_vars', 'NODE_ENV=production')
     ->set('deploy_path', '/var/www/photos/frontend');
 
@@ -29,8 +27,6 @@ host('alfheim.ragnarok.yvan.hu')
 desc('Prepare release');
 task('deploy:ng-prepare', function() {
     runLocally("npm run build:ssr");
-//    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}}");
-//    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}} --app ssr --output-hashing=none");
     runLocally("tar -cJf dist.tar.xz dist server.js package.json pm2.json");
 });
 
@@ -47,7 +43,7 @@ task('deploy:ng-upload', function() {
 });
 
 desc('Start app server');
-task('deploy:node-restart', function() {
+task('deploy:pm2-restart', function() {
     within("{{release_path}}", function () {
         run("pm2 stop --silent gallery-frontend");
         run("pm2 delete --silent gallery-frontend");
@@ -67,7 +63,7 @@ task('deploy', [
     'deploy:shared',
     'deploy:clear_paths',
     'deploy:symlink',
-    'deploy:node-restart',
+    'deploy:pm2-restart',
     'deploy:unlock',
     'cleanup',
 ]);
diff --git a/package-lock.json b/package-lock.json
index c70e6c5..2fcfcc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9898,8 +9898,7 @@
     "reflect-metadata": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz",
-      "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==",
-      "dev": true
+      "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A=="
     },
     "regenerate": {
       "version": "1.3.3",
diff --git a/package.json b/package.json
index 02f6445..377fcfd 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "core-js": "^2.4.1",
     "normalize.css": "^7.0.0",
     "pm2": "^2.6.1",
+    "reflect-metadata": "^0.1.12",
     "rxjs": "^5.5.6",
     "zone.js": "^0.8.19"
   },
diff --git a/src/app/gallery/display-image/display-image.component.css b/src/app/gallery/display-image/display-image.component.css
index d1b6e52..6c9d208 100644
--- a/src/app/gallery/display-image/display-image.component.css
+++ b/src/app/gallery/display-image/display-image.component.css
@@ -10,10 +10,22 @@
     -webkit-transition: opacity 150ms ease-in;
     -moz-transition: opacity 150ms ease-in;
     transition: opacity 150ms ease-in;
+    height: 100%;
+    width: 100%;
+    padding: 15px;
+    overflow: hidden;
+}
+
+.modal-padding {
+    overflow: hidden;
+    max-height: calc(100% - 30px);
+    max-width: calc(100% - 30px);
 }
 
 .modal-container .image {
-    display: flex;
-    margin: auto;
-    margin-top: 15px;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    max-height: calc(100% - 30px);
+    width: auto;
 }
diff --git a/src/app/gallery/display-image/display-image.component.html b/src/app/gallery/display-image/display-image.component.html
index 6a94f8d..46d9975 100644
--- a/src/app/gallery/display-image/display-image.component.html
+++ b/src/app/gallery/display-image/display-image.component.html
@@ -1,3 +1,5 @@
 <div class="modal-container" [ngStyle]="modalStyle">
-  <img *ngIf="hasImage" class="ui centered image" src="{{imageUrl}}">
+  <div class="modal-padding">
+    <img *ngIf="hasImage" class="ui centered image" src="{{imageUrl}}">
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/app/gallery/display-image/display-image.component.ts b/src/app/gallery/display-image/display-image.component.ts
index 30b43e6..daee097 100644
--- a/src/app/gallery/display-image/display-image.component.ts
+++ b/src/app/gallery/display-image/display-image.component.ts
@@ -75,7 +75,7 @@ export class DisplayImageComponent implements OnInit {
     private hide() {
         this.visible = false;
         this.titleService.setTitle(`${this.albumTitle} - photos.yvan.hu`);
-        this.router.navigate([`${this.albumTitle} - photos.yvan.hu`]);
+        this.router.navigate([`/album/${this.slug}`]);
     }
 
     private nextImage() {
@@ -129,6 +129,7 @@ export class DisplayImageComponent implements OnInit {
         let xDiff: number = this.touchX - touchEvent.changedTouches[0].clientX;
         let yDiff: number = this.touchY - touchEvent.changedTouches[0].clientY;
 
+        // noinspection JSSuspiciousNameCombination
         if (Math.abs(xDiff) > Math.abs(yDiff)) {
             if (xDiff > 0) {
                 this.prevImage();