diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index caa1fb6..547f82e 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -16,9 +16,12 @@ return ['Media' => [
     'Account'     => 'Account',
     'AddToCollection' => 'Zum Ordner hinzufügen',
     'Author'      => 'Autor',
+    'Back'     => 'Zurück',
     'Changed'     => 'Geändert',
     'Changedby'   => 'Geändert by',
     'Created'     => 'Erstellt',
+    'CreateCollection'     => 'Erstelle Ordner',
+    'CreateFile'     => 'Erstelle Datei',
     'Creator'     => 'Ersteller',
     'Data'        => 'Daten',
     'Description' => 'Beschreibung',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index d632376..1783a97 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -16,9 +16,12 @@ return ['Media' => [
     'Account'     => 'Account',
     'AddToCollection' => 'Add to collection',
     'Author'      => 'Author',
+    'Back'     => 'Back',
     'Changed'     => 'Changed',
     'Changedby'   => 'Changed by',
     'Created'     => 'Created',
+    'CreateCollection'     => 'Create Collection',
+    'CreateFile'     => 'Create File',
     'Creator'     => 'Creator',
     'Data'        => 'Data',
     'Description' => 'Description',
diff --git a/Theme/Backend/media-file-create.tpl.php b/Theme/Backend/media-file-create.tpl.php
index 34a1a31..4028bba 100755
--- a/Theme/Backend/media-file-create.tpl.php
+++ b/Theme/Backend/media-file-create.tpl.php
@@ -21,7 +21,7 @@ use phpOMS\Uri\UriFactory;
 <div class="row">
     <div class="col-xs-12">
         <div class="box">
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list?path={?path}'); ?>">Back</a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list?path={?path}'); ?>"><?= $this->getHtml('Back'); ?></a>
         </div>
     </div>
 </div>
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index dff5ff2..fbb1e78 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -31,9 +31,9 @@ $media = $this->getData('media');
 <div class="row">
     <div class="col-xs-12">
         <div class="box">
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/upload?path={?path}'); ?>">Upload</a>
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/file/create?path={?path}'); ?>">Create File</a>
-            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/collection/create?path={?path}'); ?>">Create Collection</a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/upload?path={?path}'); ?>"><?= $this->getHtml('Upload'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/file/create?path={?path}'); ?>"><?= $this->getHtml('CreateFile'); ?></a>
+            <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/collection/create?path={?path}'); ?>"><?= $this->getHtml('CreateCollection'); ?></a>
         </div>
     </div>
 </div>
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index 855f751..2f67bc7 100755
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -12,7 +12,6 @@
  */
 declare(strict_types=1);
 
-
 use \phpOMS\System\File\FileUtils;
 use \phpOMS\System\File\Local\File;
 use \phpOMS\Uri\UriFactory;
@@ -29,9 +28,9 @@ echo $this->getData('nav')->render();
     <div class="col-xs-12">
         <div class="box">
             <?php if ($this->request->getData('path') !== null) : ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list?path={?path}'); ?>">Back</a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list?path={?path}'); ?>"><?= $this->getHtml('Back'); ?></a>
             <?php else: ?>
-                <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list'); ?>">Back</a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}media/list'); ?>"><?= $this->getHtml('Back'); ?></a>
             <?php endif; ?>
         </div>
     </div>
diff --git a/Theme/Backend/media-upload.tpl.php b/Theme/Backend/media-upload.tpl.php
index 836d60d..4cbf1ce 100755
--- a/Theme/Backend/media-upload.tpl.php
+++ b/Theme/Backend/media-upload.tpl.php
@@ -41,7 +41,7 @@ use phpOMS\Uri\UriFactory;
                 <div class="portlet-body">
                     <table class="layout wf-100">
                         <tr><td><label for="iPath"><?= $this->getHtml('Path') ?></label>
-                        <tr><td><input type="text" id="iPath" name="virtualPath" value="<?= $this->request->getUri()->getQuery('path') ?? ''; ?>" disabled>
+                        <tr><td><input type="text" id="iPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled>
                         <tr><td><label><?= $this->getHtml('Settings') ?></label>
                         <tr><td><input type="checkbox" id="iAddCollection" name="addcollection" checked><label for="iAddCollection"><?= $this->getHtml('AddToCollection') ?></label>
                         <tr><td><label for="iPathSettings"><?= $this->getHtml('PathSettings') ?></label>