2 files changed, 48 insertions, 9 deletions
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 805abc467..4606cae45 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -4,7 +4,7 @@
 
 #media__manager {
     height: 100%;
-    overflow: hide;
+    overflow: hidden;
 }
 
 #media__left {
@@ -18,7 +18,7 @@
 }
 
 #media__right {
-    width: 69.9%;
+    width: 69.8%;
 
     height: 100%;
     overflow: auto;
@@ -26,6 +26,14 @@
     right: 0;
 }
 
+#media__manager h1 {
+    margin: 0;
+    padding: 0;
+    margin-bottom: 0.5em;
+}
+
+/* --- Tree formatting --- */
+
 #media__tree img {
     float:left;
     padding: 0.5em 0.3em 0 0;
@@ -42,6 +50,28 @@
     list-style-image: none;
 }
 
+/* --- options --- */
+
+#media__opts {
+    padding-left: 1em;
+    margin-bottom: 0.5em;
+}
+
+#media__opts input {
+    float: left;
+    position: absolute;
+}
+
+#media__opts label {
+    display: block;
+    float: left;
+    margin-left: 30px;
+}
+
+#media__opts br {
+    clear: left;
+}
+
 /* --- file list --- */
 
 #media__content img.load {
@@ -89,6 +119,11 @@
 
 /* --- upload form --- */
 
+#media__content div.upload {
+    font-size: 80%;
+    padding: 0.5em 0 0.5em 0.5em;
+}
+
 #media__content form.upload {
     display: block;
     border-bottom: solid 1px __dark__;
@@ -104,20 +139,24 @@
 
 #media__content form.meta label {
     display: block;
-    width: 20%;
+    width: 25%;
     float: left;
-    text-align: right;
     font-weight: bold;
-    padding-right: 1em;
+    margin-left: 1em;
+    clear: left;
 }
 
 #media__content form.meta .edit {
+    font: 100% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
     float: left;
-    width: 75%;
+    width: 70%;
+    padding-right: 0;
+    padding-left: 0.2em;
+    margin: 2px;
 }
 
 #media__content form.meta textarea.edit {
-    height: 6em;
+    height: 8em;
 }
 
 #media__content form.meta div.metafield {
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php
index 0ae4f7c66..2b032ac46 100644
--- a/lib/tpl/default/mediamanager.php
+++ b/lib/tpl/default/mediamanager.php
@@ -27,10 +27,10 @@
         <?html_msgarea()?>
         <h1><?php echo hsc($lang['mediaselect'])?></h1>
 
-        <?php tpl_mediaTree() ?>
-
         <?php /* keep the id! additional elements are inserted via JS here */?>
         <div id="media__opts"></div>
+
+        <?php tpl_mediaTree() ?>
     </div>
 
     <div id="media__right">