diff --git a/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl
index 5ef379e85..818143acd 100755
--- a/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl
+++ b/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl
@@ -2,22 +2,24 @@ onClick="return contextmenu('{$i.id}'
     , 'SP.addItem'
 
     {if $i.type|lower == 'audioclip'}
-        , 'listen', '{$i.gunid}'
+        , 'listen', '{$i.gunid}', '##audioclip##'
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
-            , 'PL.create'
+            , 'PL.create', '{$i.title|truncate:20}'
         {/if}
-        , 'edit', 'delete'
+        , 'edit',   '##audioclip##'
+        , 'delete', '##audioclip##'
     {/if}
 
     {if $i.type|lower == 'webstream'}
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
-            , 'PL.create'
+            , 'PL.create', '{$i.title|truncate:20}'
         {/if}
-        , 'edit', 'delete'
+        , 'edit',   '##webstream##'
+        , 'delete', '##webstream##'
     {/if}
 
     {if $i.type|lower == 'playlist'}
@@ -28,7 +30,9 @@ onClick="return contextmenu('{$i.id}'
                 , 'SCHEDULER.addPL', 'PL.addItem', 'delete'
             {/if}
         {else}
-            , 'SCHEDULER.addPL', 'PL.activate', 'PL.create', 'delete'
+            , 'SCHEDULER.addPL', 'PL.activate'
+            , 'PL.create', '{$i.title|truncate:20}'
+            , 'delete', '##playlist##'
         {/if}
     {/if}
 )"
diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl
index 81f4867da..8bc46fc93 100755
--- a/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl
@@ -1,34 +1,38 @@
 onClick="return contextmenu('{$i.id}'
     , 'SP.removeItem'
 
-    {if $i.type == 'audioclip'}
-        , 'listen', '{$i.gunid}'
+    {if $i.type|lower == 'audioclip'}
+        , 'listen', '{$i.gunid}', '##audioclip##'
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
-            , 'PL.create'
+            , 'PL.create', '{$i.title|truncate:20}'
         {/if}
-        , 'edit', 'delete'
+        , 'edit',   '##audioclip##'
+        , 'delete', '##audioclip##'
     {/if}
 
-    {if $i.type == 'webstream'}
+    {if $i.type|lower == 'webstream'}
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
-            , 'PL.create'
+            , 'PL.create', '{$i.title|truncate:20}'
         {/if}
-        , 'edit', 'delete'
+        , 'edit',   '##webstream##'
+        , 'delete', '##webstream##'
     {/if}
 
-    {if $i.type == 'playlist'}
+    {if $i.type|lower == 'playlist'}
         {if $_PL_activeId}
             {if $_PL_activeId == $i.id}
                 , 'PL.release'
             {elseif $PL->isAvailable($i.id) == true}
-                , 'SCHEDULER.addPL', 'PL.addItem', 'PL.activate', 'delete'
+                , 'SCHEDULER.addPL', 'PL.addItem', 'PL.activate', 'PL.delete'
             {/if}
         {elseif  $PL->isAvailable($i.id) == true}
-            , 'SCHEDULER.addPL', 'PL.activate', 'PL.create', 'delete'
+            , 'SCHEDULER.addPL', 'PL.activate'
+            , 'PL.create', '{$i.title|truncate:20}'
+            , 'delete', '##playlist##'
         {/if}
     {/if}
 )"
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl
index 299d6fde4..8cb689cd1 100755
--- a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl
@@ -31,17 +31,17 @@
                             {else}
                                 <div style="cursor: pointer">
                             {/if}
-                                {$i.title|truncate:14:'...':true}
+                                {$i.title|truncate:18}
                                 </div>
                         {else}
-                            {$i.title|truncate:14:'...':true}
+                            {$i.title|truncate:18}
                         {/if}                                         {* on some reason object call doesn´t like usage of array *}
                     </td>                                             {assign var="_duration" value=$i.duration}
                     <td {include file="scratchpad/actionhandler.tpl"} style="text-align: right; cursor: pointer">{niceTime in=$_duration}</td>
                     <td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
                         {if $PL->isAvailable($i.id) == false}
                             <div align="left"><img src="img/ico_lock.gif">
-                            <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></div> 
+                            <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></div>
                         {else}
                         <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /> {/if}
                     </td>
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
index 7659d8c02..d0b8c1352 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
@@ -45,7 +45,7 @@
                 break;
 
                 case "PL.create":
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: hpopup('{$UI_HANDLER}?act=PL.create&id="+param+"')\" "+oF+">&nbsp;##New Playlist using this File##&nbsp;</a></li>";
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: hpopup('{$UI_HANDLER}?act=PL.create&id="+param+"')\" "+oF+">&nbsp;##New Playlist including &quot;##"+contextmenu.arguments[++i]+"&quot;&nbsp;</a></li>";
                 break;
 
                 case "PL.changeFadeIn":
@@ -69,16 +69,17 @@
                 break;
 
                 case "listen":
-                    i++;
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$CONFIG.accessRawAudioUrl}?sessid={$START.sessid}&id="+contextmenu.arguments[i]+"' "+oF+">&nbsp;##Listen to File##&nbsp;</a></li>";
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$CONFIG.accessRawAudioUrl}?sessid={$START.sessid}&id="+contextmenu.arguments[++i]+"' "+oF+">&nbsp;##Listen ## "+contextmenu.arguments[++i]+"&nbsp;</a></li>";
                 break;
 
                 case "edit":
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$UI_BROWSER}?act=editItem&id="+param+"' "+oF+">&nbsp;##Edit File##&nbsp;</a></li>";
+                    i++;
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$UI_BROWSER}?act=editItem&id="+param+"' "+oF+">&nbsp;##Edit## "+contextmenu.arguments[i]+"&nbsp;</a></li>";
                 break;
 
                 case "delete":
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 400, 50)\" "+oF+">&nbsp;##Delete File##&nbsp;</a></li>";
+                    i++;
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 400, 50)\" "+oF+">&nbsp;##Delete## "+contextmenu.arguments[i]+"&nbsp;</a></li>";
                 break;
 
                 case "fileList":