diff --git a/Controller.js b/Controller.js
index 5d797ed..c81c28b 100644
--- a/Controller.js
+++ b/Controller.js
@@ -1,7 +1,7 @@
 (function (jsOMS)
 {
     "use strict";
-    
+
     jsOMS.Autoloader.defineNamespace('jsOMS.Modules');
 
     jsOMS.Modules.Media = function (app)
@@ -9,44 +9,56 @@
         this.app = app;
     };
 
-    jsOMS.Modules.Media.prototype.bind = function ()
+    jsOMS.Modules.Media.prototype.bind = function (id)
     {
-        let forms = document.getElementsByTagName('form');
+        let e      = typeof id === 'undefined' ? document.getElementsByTagName('form') : [document.getElementById(id)],
+            length = e.length;
 
-        /* Handle media forms */
-        for (let i = 0; i < forms.length; i++) {
-            let self = this;
+        for (let i = 0; i < length; i++) {
+            this.bindElement(e[i]);
+        }
+    };
 
-            if (typeof forms[i].querySelector('input[type=file]') !== 'undefined') {
-                try {
-                    this.app.uiManager.getFormManager().get(forms[i].id).injectSubmit(function (e, requestId, requestGroup)
+    jsOMS.Modules.Media.prototype.bindElement = function (form)
+    {
+        if (typeof form === 'undefined' || !form) {
+            // todo: do logging here
+
+            return;
+        }
+
+        let self = this;
+
+        if (typeof form.querySelector('input[type=file]') !== 'undefined') {
+            try {
+                // Inject media upload into form view
+                this.app.uiManager.getFormManager().get(form.id).injectSubmit(function (e, requestId, requestGroup)
+                {
+                    let fileFields = e.querySelectorAll('input[type=file]'),
+                        uploader   = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager, self.app.logger);
+
+                    uploader.setSuccess(e.id, function (type, response)
                     {
-                        let fileFields = e.querySelectorAll('input[type=file]'),
-                            uploader   = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager, self.app.logger);
-
-                        uploader.setSuccess(e.id, function (type, response)
-                        {
-                            e.querySelector('input[type=file]+input[type=hidden]').value = JSON.stringify(response.uploads);
-                            self.app.eventManager.triggerDone(requestId, requestGroup);
-                        });
-
-                        uploader.setUri(Url + '{/lang}/api/media');
-
-                        for (let i = 0; i < fileFields.length; i++) {
-                            for (let j = 0; j < fileFields[i].files.length; j++) {
-                                uploader.addFile(fileFields[i].files[j]);
-                            }
-                        }
-
-                        if (uploader.count() < 1) {
-                            return;
-                        }
-
-                        uploader.upload(e.id);
+                        e.querySelector('input[type=file]+input[type=hidden]').value = JSON.stringify(response.uploads);
+                        self.app.eventManager.trigger(requestId, requestGroup);
                     });
-                } catch (e) {
-                    this.app.logger.info('Tried to add media upload support for form without an ID.');
-                }
+
+                    uploader.setUri(Url + '{/lang}/api/media');
+
+                    for (let i = 0; i < fileFields.length; i++) {
+                        for (let j = 0; j < fileFields[i].files.length; j++) {
+                            uploader.addFile(fileFields[i].files[j]);
+                        }
+                    }
+
+                    if (uploader.count() < 1) {
+                        return;
+                    }
+
+                    uploader.upload(e.id);
+                });
+            } catch (e) {
+                this.app.logger.info('Tried to add media upload support for form without an ID.');
             }
         }
     };
@@ -54,5 +66,7 @@
 
 jsOMS.ready(function ()
 {
+    "use strict";
+
     window.omsApp.moduleManager.get('Media').bind();
 });
diff --git a/Controller.php b/Controller.php
index 41bfdde..a73c364 100644
--- a/Controller.php
+++ b/Controller.php
@@ -25,6 +25,7 @@ use phpOMS\Message\ResponseAbstract;
 use phpOMS\Model\Html\Head;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Module\WebInterface;
+use phpOMS\System\MimeType;
 use phpOMS\Views\View;
 
 /**
@@ -96,8 +97,8 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         /** @var Head $head */
         $head = $response->get('Content')->getData('head');
-        $head->addAsset(AssetType::JS, $request->getUri()->getBase() . 'Modules/Media/Models/Upload.js');
-        $head->addAsset(AssetType::JS, $request->getUri()->getBase() . 'Modules/Media/Controller.js');
+        $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Media/Models/Upload.js');
+        $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Media/Controller.js');
     }
 
     /**
@@ -175,6 +176,7 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $uploads = $this->uploadFiles($request->getFiles(), $request->getAccount());
 
+        $response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
         $response->set($request->__toString(), [['uploads' => $uploads, 'type' => 'UI']]);
     }
 
diff --git a/Models/Upload.js b/Models/Upload.js
index f2258fb..ee11ce2 100644
--- a/Models/Upload.js
+++ b/Models/Upload.js
@@ -94,6 +94,7 @@
                     }
                 }
             } catch (exception) {
+                console.log(exception);
                 self.logger.error('Invalid media upload response: ' + xhr.response);
 
                 return false;
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index 3077dad..27b79fb 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -192,7 +192,7 @@ class UploadFile
                 $rndPath = str_pad(dechex(rand(0, 65535)), 4, '0', STR_PAD_LEFT);
             } while (file_exists($this->outputDir . '/' . $rndPath));
 
-            $this->outputDir = '/../../..' . $this->outputDir . '/' . $rndPath;
+            $this->outputDir = $this->outputDir . '/' . $rndPath;
         }
     }