diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php
index 5e4d2f670..8c859b294 100644
--- a/livesupport/modules/htmlUI/var/html/ui_browser.php
+++ b/livesupport/modules/htmlUI/var/html/ui_browser.php
@@ -81,19 +81,21 @@ if ($uiBrowser->userid) {
         $Smarty->assign('uploadform', $uiBrowser->uploadFileM($ui_fmask['uploadFileM'], $uiBrowser->id));
     break;
 
+    case "editItem":
+        $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
+        $Smarty->assign('editItem', array('type' => $uiBrowser->type=='webstream' ? 'webstream' : 'file', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid));
+    break;
 
     case "editFile":
         $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
         $Smarty->assign('editItem', array('type' => 'file', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid));
     break;
 
-
     case "editWebstream":
         $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
         $Smarty->assign('editItem', array('type' => 'webstream', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid));
     break;
 
-
     case "SEARCH":
         $Smarty->assign('searchForm', $uiBrowser->SEARCH->searchForm($uiBrowser->id, $ui_fmask));
         $Smarty->assign('showLibrary', TRUE);
diff --git a/livesupport/modules/htmlUI/var/templates/file/edit.tpl b/livesupport/modules/htmlUI/var/templates/file/edit.tpl
index add79b1c7..8c7c327e4 100755
--- a/livesupport/modules/htmlUI/var/templates/file/edit.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/edit.tpl
@@ -1,5 +1,19 @@
 <div class="standardFrame">
 {include file="sub/x.tpl"}
+
+<h4>
+{if $editItem.id}
+    Edit
+{else}
+    New
+{/if}
+{if $editItem.type == 'file'}
+    File
+{else}
+    Webstream
+{/if}
+</h4>
+
 <input type="button" onClick="showData()" value="Data">
 <input type="button" onClick="showMData()" value="MData">
 
@@ -42,9 +56,15 @@ function showMData()
     document.getElementById('div_Data').style.visibility='hidden';
     document.getElementById('div_Data').style.height='0';
 }
+{/literal}
 
-document.getElementById('div_MData').style.visibility='hidden';
-document.getElementById('div_MData').style.height='0';
+{if $editItem.id}
+    document.getElementById('div_Data').style.visibility='hidden';
+    document.getElementById('div_Data').style.height='0';
+{else}
+    document.getElementById('div_MData').style.visibility='hidden';
+    document.getElementById('div_MData').style.height='0';
+{/if}
 </script>
 
-{/literal}
+
diff --git a/livesupport/modules/htmlUI/var/templates/file/objects.tpl b/livesupport/modules/htmlUI/var/templates/file/objects.tpl
index eae82799e..43f3af406 100755
--- a/livesupport/modules/htmlUI/var/templates/file/objects.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/objects.tpl
@@ -9,7 +9,7 @@
             <th>Title</th>
             <th>Type</th>
             <td align="right" width='70%'>  &nbsp;
-                {if $START.pid}<a href="{$UI_BROWSER}?act=fileBrowse&id={$GLOBALS.pid}">[go up]</a>{/if}
+                {if $START.pid}<a href="{$UI_BROWSER}?act=fileList&id={$START.pid}">[go up]</a>{/if}
             </td>
         </tr>
     {if count($structure.listdata)}
@@ -18,7 +18,7 @@
               <td align="center">
                 <span id="ID{$i.id}">
                     {if $i.type eq 'Folder'}
-                         <a href="{$UI_BROWSER}?act=fileBrowse&id={$i.id}" >[{$i.title|truncate:30}]</b>
+                         <a href="{$UI_BROWSER}?act=fileList&id={$i.id}" >[{$i.title|truncate:30}]</b>
                     {else}
                         {if $_PL_activeId == $i.id}
                             <b>{$i.title|truncate:30}</b>
diff --git a/livesupport/modules/htmlUI/var/templates/file/path.tpl b/livesupport/modules/htmlUI/var/templates/file/path.tpl
index 9e2282b0a..0f9ae6e7b 100755
--- a/livesupport/modules/htmlUI/var/templates/file/path.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/path.tpl
@@ -1,12 +1,13 @@
 {*Smarty template*}
 
 <div id="path">
-    <a href="{$UI_BROWSER}?act=fileBrowse&id={$structure.id}&tree=Y" class="button">[Tree view]</a>&nbsp;&nbsp;|&nbsp;
+    <a href="{$UI_BROWSER}?act=fileList&id={$structure.id}&tree=Y" class="button">[Tree view]</a>&nbsp;&nbsp;|&nbsp;
     {foreach from=$structure.pathdata item=o}
         {if $o.type == 'Folder'}
-            <a href="{$UI_BROWSER}?act=fileBrowse&id={$o.id}">[{$o.name}]</a> /
+            <a href="{$UI_BROWSER}?act=fileList&id={$o.id}">[{$o.name}]</a> /
         {else}
             {$o.name}
         {/if}
     {/foreach}
-</div>
\ No newline at end of file
+<a href="javascript:newFolder()">[::new&nbsp;folder::]</a>
+</div>
diff --git a/livesupport/modules/htmlUI/var/templates/file/tree.tpl b/livesupport/modules/htmlUI/var/templates/file/tree.tpl
index 1b7070083..ff59efce0 100755
--- a/livesupport/modules/htmlUI/var/templates/file/tree.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/tree.tpl
@@ -12,7 +12,7 @@
             {str_repeat str='&nbsp;&nbsp;' count=$o.level}
         {/if}
         {if $o.type == 'Folder'}
-            <a href="{$UI_BROWSER}?act=fileBrowse&id={$o.id}">[{$o.name}]</a>
+            <a href="{$UI_BROWSER}?act=fileList&id={$o.id}">[{$o.name}]</a>
         {else}
             {$o.name}
         {/if}
diff --git a/livesupport/modules/htmlUI/var/templates/menu_top.tpl b/livesupport/modules/htmlUI/var/templates/menu_top.tpl
index 9a5597359..f60aa174d 100755
--- a/livesupport/modules/htmlUI/var/templates/menu_top.tpl
+++ b/livesupport/modules/htmlUI/var/templates/menu_top.tpl
@@ -4,7 +4,6 @@
     <a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">[Upload]</a>
     <a href="{$UI_BROWSER}?folderId={$START.fid}&act=editWebstream">[Stream]</a>
     <a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">[PL Editor]</a>
-    <a href="javascript:newFolder()">[Create&nbsp;new&nbsp;folder]</a>
     <a href="{$UI_BROWSER}?id={$START.id}&act=SEARCH">[Search]</a>
     <a href="{$UI_BROWSER}?id={$START.id}&act=BROWSE">[Browse]</a>
     <a href="{$UI_BROWSER}?id={$START.id}&act=subjects">{tra 0='[User/Groups]'}</a>
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
index 51b1f887f..f33637cb3 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
@@ -68,9 +68,17 @@ function menu(id) {
                 menuHtml = menuHtml + "<tr><td><a class='menu' href='#' onClick=\"hpopup('{/literal}{$UI_HANDLER}{literal}?act=SP.removeItem&id="+id+"')\" "+oF+">&nbsp;Remove from Scratchpad&nbsp;</a></td></tr>";
             break;
 
+            case "edit":
+                menuHtml = menuHtml + "<tr><td><a class='menu' href='{/literal}{$UI_BROWSER}{literal}?act=editItem&id="+id+"'"+oF+">&nbsp;Edit&nbsp;</a></td></tr>";
+            break;
+
             case "delete":
                 menuHtml = menuHtml + "<tr><td><a class='menu' href='{/literal}{$UI_HANDLER}{literal}?act=delete&id="+id+"'"+oF+">&nbsp;!Delete Item!&nbsp;</a></td></tr>";
             break;
+
+            case "fileList":
+                menuHtml = menuHtml + "<tr><td><a class='menu' href='{/literal}{$UI_BROWSER}{literal}?act=fileList&id="+id+"'"+oF+">&nbsp;List Folder&nbsp;</a></td></tr>";
+            break;
         }
     }
     document.getElementById('menucontainer').innerHTML = menuHeader + menuHtml + menuFooter;
diff --git a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
index 7576ebc64..46483f1a9 100755
--- a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
+++ b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
@@ -10,7 +10,7 @@ onContextmenu="return menu('{$i.id}'
         {else}
             , 'PL.create'
         {/if}
-        , 'delete'
+        , 'edit', 'delete'
     {/if}
 
     {if ($i.type == 'playlist')}
@@ -24,6 +24,10 @@ onContextmenu="return menu('{$i.id}'
             , 'PL.activate', 'PL.create', 'delete'
         {/if}
     {/if}
+
+    {if ($i.type == 'Folder')}
+        , 'fileList', 'delete'
+    {/if}
     {$moreContextAfter}
 )"