diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php
index c5f989b98..7b35993b8 100755
--- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php
@@ -690,6 +690,7 @@ $ui_fmask = array(
             'element'   => 'cancel',
             'type'      => 'button',
             'label'     => 'Cancel',
+            'attributes'=> array('onClick' => 'window.close()'),
             'groupit'   => TRUE
         ),
         array(
diff --git a/livesupport/modules/htmlUI/var/html/styles_livesupport.css b/livesupport/modules/htmlUI/var/html/styles_livesupport.css
index 1fe8d735c..55da67e92 100755
--- a/livesupport/modules/htmlUI/var/html/styles_livesupport.css
+++ b/livesupport/modules/htmlUI/var/html/styles_livesupport.css
@@ -284,7 +284,7 @@ input, select { font-size: 12px;
 
 /* #################################### contenttabnav ############################### */
 
-.contenttabnav { 
+.contenttabnav {
     height: 26px;
     clear: both;
     /*background: url("css_img/bg_navigation.gif") repeat-x top left;*/
@@ -292,7 +292,7 @@ input, select { font-size: 12px;
     margin-top: 12px;
 }
 
-.contenttabnav[class] { 
+.contenttabnav[class] {
     padding-left: 10px;
     margin-top: 12px;
     margin-bottom: 12px;
@@ -397,7 +397,7 @@ input, select { font-size: 12px;
 /* #################################### CONTENTAREA ############################### */
 
 
-.content { 
+.content {
     margin: 19px;
     margin-top: 0;
     float: left;
@@ -560,48 +560,48 @@ label { font-size: 12px;
 
 /* ############################################# scheduler ################################# */
 
-.container_calender_overview { 
+.container_calender_overview {
     width: 235px;
 }
 
-.container_calender_overview p { 
+.container_calender_overview p {
     font-size: 10px;
     margin-top: 0;
     float: right;
 }
 
-.month_year { 
+.month_year {
     border: 1px solid #cdcdcd;
     border-bottom: none;
     padding: 5px 20px;
     float: right;
 }
 
-.calender_overview { 
+.calender_overview {
     border: 1px solid #cdcdcd;
 }
 
-table.calender_overview_table { 
+table.calender_overview_table {
     width: 100%;
     margin-bottom: 5px;
 }
 
-table.calender_overview_table td { 
+table.calender_overview_table td {
     border: 0;
     text-align: center;
     padding: 2px;
     font-size: 10px;
 }
 
-table.calender_overview_table td.full { 
+table.calender_overview_table td.full {
     font-weight: bold
 }
 
-table.calender_overview_table td.week { 
+table.calender_overview_table td.week {
     border-right: 1px solid #cdcdcd;
 }
 
-table.calender_overview_table a.full { 
+table.calender_overview_table a.full {
     color: #FFF;
     font-weight: bold;
     background-color: #5286ba;
@@ -610,16 +610,16 @@ table.calender_overview_table a.full {
     display: block;
 }
 
-table.calender_overview_table td.today { 
+table.calender_overview_table td.today {
     border: 1px black solid;
 }
 
-table.calender_overview_table td.current { 
+table.calender_overview_table td.current {
     background: #d5e2ee;
     /*#d5e2ee;*/
 }
 
-table.calender_overview_table td.nothing { 
+table.calender_overview_table td.nothing {
     background: #eee;
     /*#d5e2ee;*/
 }
@@ -654,24 +654,24 @@ table.scheduler_day td { font-size: 12px;
 
 /*############# SCHEDULER WEEK #######*/
 
-table.scheduler_week_time { 
+table.scheduler_week_time {
     background: #ddd;
     padding: 0;
     border: 0;
     margin: 0;
 }
- 
-table.scheduler_week_time tr { 
+
+table.scheduler_week_time tr {
     width: 20px;
     border-bottom: 1px solid #7392A6;
-} 
- 
-table.scheduler_week_time td { 
+}
+
+table.scheduler_week_time td {
     height: 20px;
     text-align: center;
-} 
+}
 
-table.scheduler_week { 
+table.scheduler_week {
     width: 790px;
     border: 1px solid #7392A6;
     padding: 0;
@@ -791,11 +791,11 @@ table.scheduler_week td p { font-size: 12px;
     margin: 0;
 }
 
-table.scheduler_month{ 
+table.scheduler_month{
     width: 790px;
 }
 
-table.scheduler_month th { 
+table.scheduler_month th {
     background-color: #8baed1;
     color: #FFF;
     font-weight: bold;
@@ -803,29 +803,29 @@ table.scheduler_month th {
     border: 1px solid #7392A6;
 }
 
-table.scheduler_month td { 
+table.scheduler_month td {
     width: 113px;
     border: 1px solid #7392A6;
     padding: 2px;
     text-align: left;
 }
 
-table.scheduler_month p { 
+table.scheduler_month p {
     margin: 0 0 10px 0;
     font-weight: bold;
     font-size: 11px;
 }
 
 
-table.scheduler_month a { 
+table.scheduler_month a {
     color: #000;
 }
 
-table.scheduler_month td.today { 
+table.scheduler_month td.today {
     background: #d5e2ee;
 }
 
-table.scheduler_month .scala { 
+table.scheduler_month .scala {
     margin: 0 0 2px 4px;
     width: 100px;
     height: 12px;
@@ -833,7 +833,7 @@ table.scheduler_month .scala {
     border: 1px solid #7F95A7;
 }
 
-table.scheduler_month .scala .scala_in { 
+table.scheduler_month .scala .scala_in {
     background: #DADADA url("css_img/bg_scala_in_scheduler.gif") repeat-x top left;
     font-size:1px;
     height: 12px;
diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php
index d0e51fab3..fb24114f8 100644
--- a/livesupport/modules/htmlUI/var/html/ui_browser.php
+++ b/livesupport/modules/htmlUI/var/html/ui_browser.php
@@ -60,7 +60,7 @@ if (is_array($_REQUEST['popup'])){
             break;
 
             case "SCHEDULER.removeItem":
-                $Smarty->assign('gunid', $_REQUEST['gunid']);
+                $Smarty->assign('scheduleId', $_REQUEST['scheduleId']);
                 $Smarty->display('popup/SCHEDULER.removeItem.tpl');
             break;
         }
diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php
index fe3f30683..0f62a65fc 100644
--- a/livesupport/modules/htmlUI/var/html/ui_handler.php
+++ b/livesupport/modules/htmlUI/var/html/ui_handler.php
@@ -252,7 +252,7 @@ switch($_REQUEST['act']){
     break;
 
     case "SCHEDULER.removeItem":
-        $uiHandler->SCHEDULER->removeFromScheduleMethod($_REQUEST);
+        $uiHandler->SCHEDULER->removeFromScheduleMethod($_REQUEST['scheduleId']);
         $uiHandler->SCHEDULER->setReload();
     break;
 
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
index c6b120d60..2f0ed8678 100755
--- a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
+++ b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
@@ -1,7 +1,9 @@
 {assign var="_form" value=$PL->metaDataForm($PL_id)}
-{assign var="dynform" value=$_form.main}
 
-{* $_form.langswitch *}
+{assign var="dynform" value=$_form.langswitch}
+{include file="sub/dynForm_plain.tpl"}
+
+{assign var="dynform" value=$_form.main}
 {include file="sub/dynForm_plain.tpl"}
 
 <script type="text/javascript">
diff --git a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl
index 0c1f47eb8..ef44281a2 100755
--- a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl
+++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl
@@ -1,10 +1,10 @@
-{include file="popup/header.tpl"} 
+{include file="popup/header.tpl"}
 
 <center>
 <b>Are you sure to remove this entry?</b>
 <br>
 <input type="button" onClick="window.close()" value="Cancel">
-<input type="button" onClick="location.href='{$UI_HANDLER}?act=SCHEDULER.removeItem&gunid={$gunid}'" value="OK">
+<input type="button" onClick="location.href='{$UI_HANDLER}?act=SCHEDULER.removeItem&scheduleId={$scheduleId}'" value="OK">
 </center>
 
 </body>
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
index 37d3f5ae3..4faf90489 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
@@ -1,5 +1,6 @@
 {$SCHEDULER->buildDay()}
-{assign var="_scale" value=$SCHEDULER->getDayTimingScale()}
+{assign var="_scale"  value=$SCHEDULER->getDayTimingScale()}
+{assign var="_entrys" value=$SCHEDULER->getDayEntrys()}
 
 <div class="content">
 <div class="container_elements">
@@ -10,7 +11,7 @@
     <form name="SCHEDULER">
     <table class="scheduler_day" style="width: 606px;">
 
-        {*    Tag vor/zurück, code um heutigen Tag abzufragen
+        {*    Tag vor/zurück + code um heutigen Tag abzufragen
         <tr>
             <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day=--')"><<</a></th>
             <th colspan="3" {if $SCHEDULER->curr.isToday} bgcolor="grey"{/if}>{$SCHEDULER->curr.dayname}, {$SCHEDULER->curr.year}-{$SCHEDULER->curr.month}-{$SCHEDULER->curr.day}</th>
@@ -24,29 +25,35 @@
             <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SCHEDULER')"></td>
             *}
 
-            <td style="width: 95px">Time</td>
+            <td style="border-left: 1px solid #ccc; width: 95px">Time</td>
             <td style="width: 481px; border-right: 0;">Show Info</td>
         </tr>
 
-        {assign var="_entrys" value=$SCHEDULER->getDayEntrys()}
         {foreach from=$_scale item="_hour"}
             {assign var="_year"  value=$_Day.year}
             {assign var="_month" value=$_Day.month}
 
-            <tr class="blue2" onContextmenu="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}', 'SCHEDULER.addItem')">
-                {*  <td style="border-left: 1px solid #ccc;"><input type="checkbox" class="checkbox" /></td> *}
-                <td>{$_hour|string_format:"%02d"}:00</td>
-                <td style="border-right: 1px solid #ccc;">
-                {if is_array($_entrys[$_hour])}
+            {if is_array($_entrys[$_hour])}
+                <tr class="blue1">
+                    <td style="border-left: 1px solid #ccc;" onContextmenu="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}', 'SCHEDULER.addItem')">{$_hour|string_format:"%02d"}:00</td>
+                    <td style="border-right: 1px solid #ccc;">
+
                     {foreach from=$_entrys[$_hour] item="i"}    {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
-                        {$i.title}:
+                        <div onContextmenu="return contextmenu('scheduleId={$i.id}', 'SCHEDULER.removeItem')">
+                        <b>{$i.title}</b>
                         {$i.start}-{$i.end}
                         {$i.creator}
-                {/foreach}
-                {/if}
-                </td>
-            </tr>
+                        </div>
+                    {/foreach}
 
+                    </td>
+                </tr>
+            {else}
+                <tr class="blue2" onContextmenu="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}', 'SCHEDULER.addItem')">
+                    <td style="border-left: 1px solid #ccc;">{$_hour|string_format:"%02d"}:00</td>
+                    <td style="border-right: 1px solid #ccc;"></td>
+                </tr>
+            {/if}
         {/foreach}
     </table>
     </form>
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
index 24bea088c..a9e407631 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
@@ -19,7 +19,7 @@
         <table class="scheduler_week">
             <tr>
                 {* Link Woche zurück <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> *}
-                <th class="firstrow"></th>
+                <th class="firstrow" style="border-left: 1px solid #ccc"></th>
             {foreach from=$SCHEDULER->Week item="_Day"}      {* hier werden die Tagesnamen angezeigt *}
                 <th class="date"></th>
                 <th class="day"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.label.full}</a></th>
@@ -28,9 +28,9 @@
             </tr>
 
             <tr>
-                <td class="firstrow_secondcol"></td>
+                <td class="firstrow_secondcol" style="border-left: 1px solid #ccc"></td>
             {foreach from=$SCHEDULER->Week item="_Day"}     {* hier werden die Tagesnummern angezeigt *}
-                <td class="date_secondcol" {* {if $_Day.isToday} bgcolor="grey"{/if} *}>
+                <td class="date_secondcol">
                     <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')"><b>{$_Day.day}</b></a>
                 </td>
                 <td class="day_secondcol"></td>
@@ -43,15 +43,17 @@
             {assign var="_month" value=$_Day.month}
 
             <tr>
-                <td class="firstrow">{$_hour}</td>
+                <td class="firstrow" style="border-left: 1px solid #ccc">{$_hour}</td>
             {foreach from=$SCHEDULER->Week item="_day"}
             {if is_array($_entrys[$_day.day][$_hour])}
                 <td class="date_full" onContextmenu="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}', 'SCHEDULER.addItem')"></td>
-                <td class="day_full"  onContextmenu="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}', 'SCHEDULER.addItem')">
+                <td class="day_full">
                 {foreach from=$_entrys[$_day.day][$_hour] item="i"}
+                    <div onContextmenu="return contextmenu('scheduleId={$i.id}', 'SCHEDULER.removeItem')">
                     <h2>{$i.title|truncate:12}</h2>
                     <p>{$i.start|truncate:5:""} - {$i.end|truncate:5:""}</p>
                     <p>{$i.creator}</p>
+                    </div>
                 {/foreach}
                 </td>
             {else}
diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php
index 8e4716ee3..32acbb741 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -391,7 +391,9 @@ class uiPlaylist
 
         $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
         $this->Base->_parseArr2Form($form, $mask['langswitch']);
-        $output['langswitch'] = $form->toHTML();
+        $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
+        $form->accept($renderer);
+        $output['langswitch'] = $renderer->toArray();
 
         #print_r($output);
         return $output;
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
index c84342fab..2a9a0f7f5 100755
--- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
@@ -78,23 +78,25 @@ class uiScheduler extends uiCalendar
     function getWeekEntrys()
     {
         ## build array within all entrys of current week ##
-
         $this->buildWeek();
-
         $weekStart = strftime("%Y%m%d", $this->Week[0]['timestamp']);
         $weekEnd   = strftime("%Y%m%d", $this->Week[6]['timestamp']);
-
         $arr = $this->displayScheduleMethod($weekStart.'T00:00:00', $weekEnd.'T23:59:59.999999');
+        #print_r($arr);
+
         if (!count($arr))
             return FALSE;
+
         foreach ($arr as $key => $val) {
             $items[strftime('%d', $this->_datetime2timestamp($val['start']))][number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array (
+                'id'        => $val['id'],
                 'start'     => substr($val['start'], strpos($val['start'], 'T')+1),
                 'end'       => substr($val['end'],   strpos($val['end'], 'T') + 1),
                 'title'     => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE),
                 'creator'   => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_CREATOR),
             );
         }
+
         #print_r($items);
         return $items;
     }
@@ -103,22 +105,24 @@ class uiScheduler extends uiCalendar
     function getDayEntrys()
     {
         ## build array within all entrys of current day ##
-
         $this->buildDay();
-
         $day = strftime("%Y%m%d", $this->Day[0]['timestamp']);
-
         $arr = $this->displayScheduleMethod($day.'T00:00:00', $day.'T23:59:59.999999');
+        #print_r($arr);
+
         if (!count($arr))
             return FALSE;
+
         foreach ($arr as $key => $val) {
-            $items[strftime('%d', $this->_datetime2timestamp($val['start']))][]= array (
+            $items[number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array (
+                'id'        => $val['id'],
                 'start'     => substr($val['start'], strpos($val['start'], 'T')+1),
                 'end'       => substr($val['end'],   strpos($val['end'], 'T') + 1),
                 'title'     => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE),
                 'creator'   => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_CREATOR),
             );
         }
+
         #print_r($items);
         return $items;
     }
@@ -415,20 +419,19 @@ class uiScheduler extends uiCalendar
     }
 
 
-    function removeFromScheduleMethod(&$formdata)
+    function removeFromScheduleMethod($id)
     {
-        $gunid = $formdata['gunid'];
         #echo "Unschedule Gunid: $gunid";
-        $r = $this->spc->removeFromScheduleMethod($this->Base->sessid, $gunid);
+        $r = $this->spc->removeFromScheduleMethod($this->Base->sessid, $id);
         #print_r($r);
         if ($this->_isError($r))
             return FALSE;
-        $this->Base->_retMsg('Entry with ScheduleId $1 removed', $gunid);
+        if (UI_VERBOSE) $this->Base->_retMsg('Entry with ScheduleId $1 removed', $id);
     }
 
 
     function displayScheduleMethod($from, $to)
-    {   return;
+    {
         #echo $from.$to;
         $r = $this->spc->displayScheduleMethod($this->Base->sessid, $from, $to);
         if ($this->_isError($r))