diff --git a/livesupport/modules/htmlUI/var/templates/file/list.tpl b/livesupport/modules/htmlUI/var/templates/file/list.tpl
index fc180c478..5747c320e 100755
--- a/livesupport/modules/htmlUI/var/templates/file/list.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/list.tpl
@@ -2,15 +2,19 @@
 <!-- start file -->
 <div class="container_elements" style="width: 607px;">
 <h1>##File Management##</h1>
+
 {if $showTree}
     {include file="file/tree.tpl"}
 {/if}
+
 {if $showObjects}
     {include file="file/objects.tpl"}
 {/if}
+
 {if $permissions}
     {include file="file/permissions.tpl"}
 {/if}
+
 </div>
 <!-- end file -->
 </div>
diff --git a/livesupport/modules/htmlUI/var/templates/file/objects.tpl b/livesupport/modules/htmlUI/var/templates/file/objects.tpl
index 519c5d980..aefcd1d39 100755
--- a/livesupport/modules/htmlUI/var/templates/file/objects.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/objects.tpl
@@ -1,18 +1,22 @@
 {assign var="_PL_activeId" value=$PL->getActiveId()}
+
 <div class="contenttabnav">
 {if $START.pid}
     <a href="{$UI_BROWSER}?act=fileList&id={$START.pid}">##go up##</a>
 {/if}
+
 {include file="file/path.tpl"}
+
 </div>
     <div class="head" style="width:555px; height: 21px;">&nbsp;
 </div>
-    <div class="container_table" style="width: 555px; height: auto;">
+
+<div class="container_table" style="width: 555px; height: auto;">
 <table>
     <tr class="blue_head">
-            <td style="width: 130px">Title</td>
+            <td style="width: 250px">Title</td>
             <td style="width: 50px">Type</td>
-            <td style="width: 447px; border: 0">  &nbsp;
+            <td style="width: 255px; border: 0">  &nbsp;
             </td>
         </tr>
     {if count($structure.listdata)}
@@ -38,17 +42,20 @@
                   &nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>
                   &nbsp;<a href="javascript:fcopy('{$i.id}', '.')">##copy##</a>
                   &nbsp;<a href="{$UI_BROWSER}?act=permissions&id={$i.id}">##permissions##</a>
-                  <!--
+                  {*
                   {if ($delOverride eq $i.id)}
                       <a href="{$UI_HANDLER}?act=delete&id={$i.id}&delOverride={$i.id}"
                         onClick="return confirm('Really delete non empty Folder &quot;{$i.name}&quot; now?')">[DEL]</a>
                   {else}
                       <a href="{$UI_HANDLER}?act=delete&id={$i.id}"
                         onClick="return confirm('Delete &quot;{$i.name}&quot;?')">[DEL]</a>
-                  {/if} -->
+                  {/if}
+                  *}
                   {if $i.type|lower != 'folder'}
+                      {*
                       &nbsp;<a href="{$UI_BROWSER}?act=getMData&id={$i.id}">##MDataXML##</a>
-                      <!-- &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a> -->
+                      &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a>
+
                       {if $i.type|lower eq 'webstream'}
                           &nbsp;<a href="{$UI_BROWSER}?act=editWebstream&id={$i.id}">##Edit##</a>
                       {elseif $i.type|lower eq 'audioclip'}
@@ -56,14 +63,16 @@
                           &nbsp;<a href="{$CONFIG.accessRawAudioUrl}?id={$i.gunid}&sessid={$START.sessid}">##Access##</a>
                           &nbsp;<a href="{$UI_BROWSER}?act=_analyzeFile&id={$i.id}">##RawAnalyze##</a>
                       {/if}
-                      <!-- &nbsp;<a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.addItem&id={$i.id}', '2SP')">[SP]</a> -->
+
+                      &nbsp;<a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.addItem&id={$i.id}', '2SP')">[SP]</a>
+                      *}
                   {/if}
                   &nbsp;
               </td>
            </tr>
         {/foreach}
     {else}
-        <tr><td align="center" width="400">##No objects##</td></tr>
+        <tr><td align="center" colspan="3" width="400" style="border:0">##No objects##</td></tr>
     {/if}
 </table>
 </div>
diff --git a/livesupport/modules/htmlUI/var/templates/file/path.tpl b/livesupport/modules/htmlUI/var/templates/file/path.tpl
index e1888a356..8903e4e3f 100755
--- a/livesupport/modules/htmlUI/var/templates/file/path.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/path.tpl
@@ -1,13 +1,13 @@
-{*Smarty template*}
 &nbsp;&nbsp;|&nbsp;&nbsp;
-    <a href="{$UI_BROWSER}?act=fileList&id={$structure.id}&tree=Y">##Tree view##</a>
-    &nbsp;&nbsp;|&nbsp;&nbsp;
-    ##Folder Structure##:
-    {foreach from=$structure.pathdata item=o}
-        {if $o.type == 'Folder'}
-            <a href="{$UI_BROWSER}?act=fileList&id={$o.id}">##{$o.name}##</a> /
-        {else}
-            ##{$o.name}##
-        {/if}
-    {/foreach}
-<a href="javascript:newFolder()">##new&nbsp;folder##</a>
+<a href="{$UI_BROWSER}?act=fileList&id={$structure.id}&tree=Y">##Tree view##</a>
+&nbsp;&nbsp;|&nbsp;&nbsp;
+##Folder Structure##:
+{foreach from=$structure.pathdata item=o}
+    {if $o.type == 'Folder'}
+        <a href="{$UI_BROWSER}?act=fileList&id={$o.id}">##{$o.name}##</a> /
+    {else}
+        ##{$o.name}##
+    {/if}
+{/foreach}
+&nbsp;&nbsp;&nbsp;
+<input type="button" class="button" value="##new&nbsp;folder##" onclick="newFolder()">
diff --git a/livesupport/modules/htmlUI/var/templates/file/permissions.tpl b/livesupport/modules/htmlUI/var/templates/file/permissions.tpl
index 4aa0a7704..970fa66c8 100755
--- a/livesupport/modules/htmlUI/var/templates/file/permissions.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/permissions.tpl
@@ -1,8 +1,12 @@
-<div id="permissions">
-{include file="sub/x.tpl"}
+<div class="container_table" style="width: 555px; height: auto;">
+<table>
+    <tr class="blue_head">
+            <td style="width: 300px">Subject Name</td>
+            <td style="width: 50px">Action</td>
+            <td style="width: 50px;">Permission</td>
+            <td style="width: 50px; border: 0">&nbsp;</td>
+        </tr>
 
-<table id="tbl" border="0" cellpadding="5">
-    <tr><td><b>Subject Name</b></td><td><b>Action</b></td><td><b>Permission</b></td><td></td></tr>
 
     {if (is_array($permissions.perms) && count($permissions.perms)>0)}
 
@@ -21,14 +25,14 @@
                 <td>{* <a <?php #href="alibExPList.php?id=<?php echo$row['subj']? >"?>> *}{$row.login}</a></td>
                 <td>{$row.action}</td>
                 <td>{$da}</td>
-                <td>
+                <td style="border:0">
                     <a href="{$UI_HANDLER}?act=removePerm&permid={$row.permid}&oid={$permissions.id}&id={$permissions.id}"
                     onClick="return confirm('Delete permission &quot;{$da}&nbsp;{$row.action}&quot; for user {$row.login}?')">[remove]</a>
                 </td>
             </tr>
         {/foreach}
     {else}
-        <tr><td colspan="4">No Permissions set.</td></tr>
+        <tr><td colspan="4" style="border:0">No Permissions set.</td></tr>
     {/if}
 </table>
 
diff --git a/livesupport/modules/htmlUI/var/templates/footer.tpl b/livesupport/modules/htmlUI/var/templates/footer.tpl
index 390d30924..a3a10bb00 100644
--- a/livesupport/modules/htmlUI/var/templates/footer.tpl
+++ b/livesupport/modules/htmlUI/var/templates/footer.tpl
@@ -1,4 +1,4 @@
-        <div class="copyright">LiveSupport 0.9.1 build 2005-05-07 &copy;2005 <a href="http://www.mdlf.org" target="_blank">MDLF</a> - maintained and distributed under GNU/GPL by <a href="http://www.campware.org" target="_blank">CAMPWARE</a></div>
+        <div class="copyright">LiveSupport 1.0 rc &copy;2005 <a href="http://www.mdlf.org" target="_blank">MDLF</a> - maintained and distributed under GNU/GPL by <a href="http://www.campware.org" target="_blank">CAMPWARE</a></div>
     </div>
 </body>
 </html>
diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php
index 885765175..c42a43ad0 100644
--- a/livesupport/modules/htmlUI/var/ui_base.inc.php
+++ b/livesupport/modules/htmlUI/var/ui_base.inc.php
@@ -348,11 +348,11 @@ class uiBase
     }
 
 
-    function _getMDataValue($id, $key, $langid=FALSE)
+    function _getMDataValue($id, $key, $langid=FALSE, $deflangid=UI_DEFAULT_LANGID)
     {
         if (!$langid) $langid = $_SESSION['langid'];
 
-        if (is_array($arr = $this->gb->getMDataValue($id, $key, $this->sessid, $langid))) {
+        if (is_array($arr = $this->gb->getMDataValue($id, $key, $this->sessid, $langid, $deflangid))) {  
             $value = current($arr);
             return $value['value'];
         }
diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php
index 456d228a2..341c7893f 100644
--- a/livesupport/modules/htmlUI/var/ui_browser.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browser.class.php
@@ -353,7 +353,7 @@ class uiBrowser extends uiBase {
                 $mask['pages'][$key][$k]['element']    = $key.'___'.$this->_formElementEncode($v['element']);
                 $mask['pages'][$key][$k]['attributes'] = array_merge($mask['pages'][$key][$k]['attributes'], array('onChange' => "spread(this, '".$this->_formElementEncode($v['element'])."')"));
                 ## load data from GreenBox
-                if ($getval = $this->_getMDataValue($id, $v['element'], $langid)) {
+                if ($getval = $this->_getMDataValue($id, $v['element'], $langid, NULL)) {
                     $mask['pages'][$key][$k]['default']                 = $getval;
                     $mask['pages'][$key][$k]['attributes']['onFocus']   = 'MData_confirmChange(this)';
                 }
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php
index 5dbb90487..b2f1a3b42 100644
--- a/livesupport/modules/htmlUI/var/ui_handler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_handler.class.php
@@ -117,7 +117,7 @@ class uiHandler extends uiBase {
         $folderId = $formdata['folderId'];
 
         if ($this->gb->getFileType($folderId) != 'Folder') {
-            $this->_retMsg ('Target is not Folder');
+            $this->_retMsg('Target is not Folder');
             $this->redirUrl = UI_BROWSER."?act=fileList";
             return FALSE;
         }
@@ -125,7 +125,7 @@ class uiHandler extends uiBase {
             $this->redirUrl = UI_BROWSER."?act=editFile&id=".$id;
             return FALSE;
         }
-        $tmpgunid = md5(microtime().$_SERVER['SERVER_ADD3R'].rand()."org.mdlf.livesupport");
+        $tmpgunid = md5(microtime().$_SERVER['SERVER_ADDR'].rand()."org.mdlf.livesupport");
         $ntmp = $this->gb->bufferDir.'/'.$tmpgunid;
         move_uploaded_file($formdata['mediafile']['tmp_name'], $ntmp);
         chmod($ntmp, 0664);