diff --git a/media.php b/media.php
index 7f2101449c9868b7862e3aaf04b9c7f5873984d9..3b71f62a326c537203e3b7b5a11d1ec7dd1baae2 100644
--- a/media.php
+++ b/media.php
@@ -91,7 +91,8 @@ function media_upload($NS){
 function media_html_list_namespaces($item){
   $ret  = '';
   $ret .= '<a href="'.DOKU_BASE.'media.php?ns='.idfilter($item['id']).'" class="idx_dir">';
-  $ret .= $item['id'];
+  $pos = strrpos($item['id'], ':');
+  $ret .= substr($item['id'], $pos > 0 ? $pos + 1 : 0);
   $ret .= '</a>';
   return $ret;
 }
diff --git a/tpl/default/layout.css b/tpl/default/layout.css
index db419f00e1a21dce857971c47b16da3012f4cfd2..fea7c58ab468363e5442d14c388ee42f5da25ce1 100644
--- a/tpl/default/layout.css
+++ b/tpl/default/layout.css
@@ -98,17 +98,12 @@ div.uploadform {
 .mediaselect-left {
   float:left;
   padding: 0.5em;
-/*  height:230px;
-  overflow:auto;*/
+  width:30%;
 }
 
 .mediaselect-right {
   float:right;
   border-left: 1px solid #8cacbb;
   padding: 0.5em;
-  width: 50%;
-  max-width: 50%;
-/*  width:350px;
-  height:230px;
-  overflow:auto;*/
+  width:65%;
 }