diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/edit.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/edit.tpl
new file mode 100755
index 000000000..add79b1c7
--- /dev/null
+++ b/livesupport/modules/htmlUI/var/templates/fileBrowse/edit.tpl
@@ -0,0 +1,50 @@
+<div class="standardFrame">
+{include file="sub/x.tpl"}
+<input type="button" onClick="showData()" value="Data">
+<input type="button" onClick="showMData()" value="MData">
+
+{if $editItem.type == 'file'}
+<div id="div_Data">
+    {include file="file/fileform.tpl"}
+</div>
+<div id="div_MData">
+    {include file="file/metadataform.tpl"}
+</div>
+{/if}
+
+
+
+{if $editItem.type == 'webstream'}
+<div id="div_Data">
+    {include file="file/webstreamform.tpl"}
+</div>
+<div id="div_MData">
+    {include file="file/metadataform.tpl"}
+</div>
+{/if}
+
+</div>
+
+{literal}
+<script>
+
+function showData()
+{
+    document.getElementById('div_Data').style.visibility='visible';
+    document.getElementById('div_Data').style.height='';
+    document.getElementById('div_MData').style.visibility='hidden';
+    document.getElementById('div_MData').style.height='0';
+}
+function showMData()
+{
+    document.getElementById('div_MData').style.visibility='visible';
+    document.getElementById('div_MData').style.height='';
+    document.getElementById('div_Data').style.visibility='hidden';
+    document.getElementById('div_Data').style.height='0';
+}
+
+document.getElementById('div_MData').style.visibility='hidden';
+document.getElementById('div_MData').style.height='0';
+</script>
+
+{/literal}
diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/fileBrowse.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/fileBrowse.tpl
deleted file mode 100755
index 91aff64bc..000000000
--- a/livesupport/modules/htmlUI/var/templates/fileBrowse/fileBrowse.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{if $showTree}
-    {include file="fileBrowse/tree.tpl"}
-{/if}
-{if $showObjects}
-    {include file="fileBrowse/objects.tpl"}
-{/if}
-
-{if $permissions}
-    {include file="fileBrowse/permissions.tpl"}
-{/if}
diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/objects.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/objects.tpl
deleted file mode 100755
index 7f325f17b..000000000
--- a/livesupport/modules/htmlUI/var/templates/fileBrowse/objects.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{PL->getActiveId assign=_PL_activeId}
-
-<div id="objects">
-{include file="sub/x.tpl"}
-
-
-<table border="0" width="90%" align="center">
-    <tr bgcolor="{cycle values='#eeeeee, #dadada"'}">
-            <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}
-            </td>
-        </tr>
-    {if count($structure.listdata)}
-        {foreach from=$structure.listdata item=i}
-            <tr bgcolor="{cycle values='#eeeeee, #dadada"'}" {assign var="moreContextBefore" value=", 'SP.addItem'"}{include file="sub/contextmenu.tpl"}>
-              <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>
-                    {else}
-                        {if $_PL_activeId == $i.id}
-                            <b>{$i.title|truncate:30}</b>
-                        {else}
-                            {$i.title|truncate:30}
-                        {/if}
-                    {/if}
-                </span>
-              </td>
-              <td align="center">{$i.type}</td>
-              <td>
-                  <!-- &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> -->
-                  &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 $i.type != 'Folder'}
-                      <br>
-                      &nbsp;<a href="{$UI_BROWSER}?act=getMData&id={$i.id}">[MDataXML]</a>
-                      <!-- &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a> -->
-                      {if $i.type eq 'webstream'}
-                          &nbsp;<a href="{$UI_BROWSER}?act=addWebstream&id={$i.id}&replace=1">[Edit]</a>
-                      {elseif $i.type eq 'audioclip'}
-                          &nbsp;<a href="{$UI_BROWSER}?act=uploadFile&id={$i.id}&replace=1">[Edit]</a>
-                          &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> -->
-                  {/if}
-                  &nbsp;
-              </td>
-           </tr>
-        {/foreach}
-    {else}
-        <tr><td align="center" width="400">No objects</td></tr>
-    {/if}
-</table>
-
-</div>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/path.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/path.tpl
deleted file mode 100755
index 9e2282b0a..000000000
--- a/livesupport/modules/htmlUI/var/templates/fileBrowse/path.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{*Smarty template*}
-
-<div id="path">
-    <a href="{$UI_BROWSER}?act=fileBrowse&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> /
-        {else}
-            {$o.name}
-        {/if}
-    {/foreach}
-</div>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/permissions.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/permissions.tpl
deleted file mode 100755
index 4aa0a7704..000000000
--- a/livesupport/modules/htmlUI/var/templates/fileBrowse/permissions.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<div id="permissions">
-{include file="sub/x.tpl"}
-
-<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)}
-
-        {foreach from=$permissions.perms item=row}
-            {if $row.type eq 'A'}
-                {assign var='da' value='allow'}
-            {else}
-                {if $row.type eq 'D'}
-                    {assign var='da' value='deny'}
-                {else}
-                    {assign var='da' value=$row.type}
-                {/if}
-            {/if}
-
-            <tr bgcolor="{cycle values='#eeeeee, #dadada'}">
-                <td>{* <a <?php #href="alibExPList.php?id=<?php echo$row['subj']? >"?>> *}{$row.login}</a></td>
-                <td>{$row.action}</td>
-                <td>{$da}</td>
-                <td>
-                    <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>
-    {/if}
-</table>
-
-<br>
-
-<form action="{$UI_HANDLER}" method="post">
-
-Add Permission
-<select name="allowDeny">
- <option value="A">Allow</option>
- <option value="D">Deny</option>
-</select>
-
-for Action
-<select name="permAction">
- <option value="_all">all</option>
-    {if is_array($permissions.actions)}
-        {foreach from=$permissions.actions item='it'}
-            <option value="{$it}">{$it}</option>
-        {/foreach}
-    {/if}
-</select>
-
-to Subject
-<select name="subj">
-    {if is_array($permissions.subjects)}
-        {foreach from=$permissions.subjects item='it'}
-            <option value="{$it.id}">{$it.login}</option>
-        {/foreach}
-    {/if}
-</select>
-<input type="hidden" name="act" value="addPerm">
-<input type="hidden" name="id" value="{$permissions.id}">
-<input type="submit" value="Do it!">
-</form>
-
-</div>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/fileBrowse/tree.tpl b/livesupport/modules/htmlUI/var/templates/fileBrowse/tree.tpl
deleted file mode 100755
index 1b7070083..000000000
--- a/livesupport/modules/htmlUI/var/templates/fileBrowse/tree.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{*Smarty template*}
-
-<div id="tree">
-
-{if is_array($structure.treedata)}
-    {foreach from=$structure.treedata item=o}
-        <div style="background-color: {cycle values="#eeeeee,#dadada"}">
-        {$structure.treedata.type}
-        {if $structure.treedata.tree}
-            {str_repeat str='&nbsp;' count=3}
-        {else}
-            {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>
-        {else}
-            {$o.name}
-        {/if}
-        <br>
-        </div>
-    {/foreach}
-{/if}
-
-</div>
\ No newline at end of file