diff --git a/livesupport/modules/htmlUI/var/formmask/general.inc.php b/livesupport/modules/htmlUI/var/formmask/general.inc.php
index 63a7a1691..8b2921f05 100755
--- a/livesupport/modules/htmlUI/var/formmask/general.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/general.inc.php
@@ -564,14 +564,14 @@ $ui_fmask = array(
                    'element'   => 'switchdown',
                    'type'      => 'button',
                    'label'     => '-',
-                   'attributes'=> array('onClick' => 'switchDown()'),
+                   'attributes'=> array('onClick' => 'pl_switchDown()', 'onMousedown' => 'pl_start("Down")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
                    'groupit'   => TRUE
                ),
                array(
                    'element'   => 'switchup',
                    'type'      => 'button',
                    'label'     => '+',
-                   'attributes'=> array('onClick' => 'switchUp()'),
+                   'attributes'=> array('onClick' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
                    'groupit'   => TRUE
                ),
                array(
diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php
index 920409b65..886d3c53b 100644
--- a/livesupport/modules/htmlUI/var/html/ui_browser.php
+++ b/livesupport/modules/htmlUI/var/html/ui_browser.php
@@ -43,7 +43,7 @@ if (is_array($_REQUEST['popup'])){
 
             case "PL.changeTransition";
                 $Smarty->assign('dynform', $uiBrowser->PLAYLIST->changeTransitionForm($_REQUEST['id'], $_REQUEST['type'], $ui_fmask['PL.changeTransition']));
-                $Smarty->display('popup/PL.changeTransition.tpl');
+                $Smarty->display('playlist/changeTransition.tpl');
             break;
         }
     }
diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php
index 412c4f5e8..fa28597ef 100644
--- a/livesupport/modules/htmlUI/var/html/ui_handler.php
+++ b/livesupport/modules/htmlUI/var/html/ui_handler.php
@@ -173,18 +173,15 @@ switch($_REQUEST['act']){
     break;
 
     case "PL.activate":
-        $uiHandler->PLAYLIST->setReload();
-        if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE) {
+        if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE)
             $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
-        }
+        $uiHandler->PLAYLIST->setReload();
     break;
 
     case "PL.create":
-        $uiHandler->PLAYLIST->setReload();
-        if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE) {
+        if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE)
             $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
-        }
-
+        $uiHandler->PLAYLIST->setReload();
     break;
 
     case "PL.addItem":
@@ -203,7 +200,8 @@ switch($_REQUEST['act']){
     break;
 
     case "PL.save":
-        $uiHandler->PLAYLIST->save();
+        if (($ui_tmpid = $uiHandler->PLAYLIST->save()) !== FALSE)
+            $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
         $uiHandler->PLAYLIST->setReload();
     break;
 
@@ -217,12 +215,17 @@ switch($_REQUEST['act']){
         $uiHandler->PLAYLIST->setReload();
     break;
 
+    case "PL.moveItem":
+        $uiHandler->PLAYLIST->moveItem($_REQUEST['id'], $_REQUEST['pos']);
+        $uiHandler->PLAYLIST->setReload();
+    break;
+
     case "SCHEDULER.set":
         $uiHandler->SCHEDULER->set($_REQUEST);
         $uiHandler->SCHEDULER->setReload();
     break;
 
-    case "SCHEDULER.uploadPlaylistMethod":   
+    case "SCHEDULER.uploadPlaylistMethod":
         $uiHandler->SCHEDULER->uploadPlaylistMethod($_REQUEST);
         $uiHandler->SCHEDULER->setReload();
     break;
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl
index 6366fe34e..835a28129 100755
--- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl
+++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl
@@ -2,7 +2,7 @@
 <tr align="center" style="background-color: {cycle values='#eeeeee, #dadada'}"><td></td><td>Title</td><td>Duration</td><td>Type</td></tr>
 
 {PL->getFlat assign='FLAT'}
-{foreach from=$FLAT item='i'}
+{foreach from=$FLAT key='pos' item='i'}
     <!-- {$n++} -->
     <tr onMouseOver="highlight()"
         onMouseOut="darklight()"
@@ -12,7 +12,13 @@
     <tr onMouseOver="highlight()"
         onMouseOut="darklight()"
         onContextmenu="return menu('{$i.attrs.id}', 'PL.removeItem')" style="background-color: {cycle values='#eeeeee, #dadada'}">
-        <td><input type="checkbox" name="{$i.attrs.id}"></td>
+        <td>
+            <input type="checkbox" name="{$i.attrs.id}">
+            <font size="+1">
+            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')">&uarr;</a>
+            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos+1}')">&darr;</a>
+            </font>
+        </td>
         <td>{$i.title}</td>
         <td>{$i.duration}</td>
         <td>{$i.type}</td>
@@ -28,7 +34,7 @@
 
 <tr style="background-color: {cycle values='#eeeeee, #dadada'}">
     <td><input type="checkbox" name="all" onClick="form_switchAll('PL')"></th>
-    <td align="center" colspan="2"><a href="#" onClick="form_submit('PL')">[Remove Selected]</a></th>
+    <td align="center" colspan="2"><a href="#" onClick="form_submit('PL', 'PL.removeItem')">[Remove Selected]</a></th>
     <td align="center" colspan="2"><a href="#" onClick="form_clearAll('PL')">[Clear]</a></th>
 </tr>
 
diff --git a/livesupport/modules/htmlUI/var/templates/popup/PL.changeTransition.tpl b/livesupport/modules/htmlUI/var/templates/popup/PL.changeTransition.tpl
deleted file mode 100755
index 328e1ef1d..000000000
--- a/livesupport/modules/htmlUI/var/templates/popup/PL.changeTransition.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{*Smarty template*}
-
-{include file="header.tpl"}
-{include file="script/PL.changeTransition.js.tpl"}
-{include file="sub/dynForm_plain.tpl"}
-
-</body>
-</html>
-
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
index 91203588d..38fcce1f3 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
@@ -47,12 +47,12 @@
 
         {if $_Day.isEmpty}
                     <div>
-        {elseif $_Day.isSelected}
+        {elseif $_Day.isCurrent}
                     <div style="background-color: lightblue">
         {else}
                     <div style="background-color: white">
         {/if}
-        {if $_Day.isScheduled}
+        {if $_Day.isSelected}
                         <b><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.day}</a></b>
         {else}
                         <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.day}</a>
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
index 40180c7d1..c89511c2e 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
@@ -3,8 +3,13 @@
 <table border=1>
 
 {foreach from=$SCHEDULER->Day item="_Hour"}
+    {assign var="_hour" value=$_Hour.hour}
+    <tr>
+        <td {include file="scheduler/contextmenu.tpl"}>
+            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}')">{$_Hour.hour}
+        </td>
 
-    <tr><td><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}')">{$_Hour.hour}</td></tr>
+    </tr>
 
 {/foreach}
 
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
index 993d332ab..3f50505c1 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
@@ -10,7 +10,11 @@
 </tr>
 
 {foreach from=$SCHEDULER->Month item="_Day"}
-    {assign var="percentage" value=$SCHEDULER->getDayUsagePercentage($_Day.year, $_Day.month, $_Day.day)}
+    {if $_Day.isSelected}
+        {assign var="percentage" value=$SCHEDULER->getDayUsagePercentage($_Day.year, $_Day.month, $_Day.day)}
+    {else}
+        {assign var="percentage" value="0"}
+    {/if}
 
     {if $_Day.isFirst}
         <tr>
@@ -20,7 +24,7 @@
         <td>&nbsp;</td>
     {else}
         <td width="80">
-            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}')">{$_Day.day} 
+            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}')">{$_Day.day}
             <div><img src="img/percentage_red.png" width="{if $percentage>50}{$percentage}{elseif $percentage>0}{$percentage+2}{else}0{/if}%" height="10" border="0"><img src="img/percentage_blue.png" width="{if $percentage>50}{$null-$percentage+100}{elseif $percentage>0}{$NULL-$percentage-2+100}{else}100{/if}%" height="10" border="0"></div>
         </td>
     {/if}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
index 15eb3123b..46db4ac64 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
@@ -7,11 +7,11 @@
         {/foreach}
     </select>
     <input type="hidden" name="sc_last">
-    <input value="00" type="text" size="2" name="hour" onClick="sc_act(this)" onChange="sc_checkrange(); sc_twodigits()" onBlur="sc_check_int(this)"> :
+    <input value="{$SCHEDULER->curr.hour}" type="text" size="2" name="hour" onClick="sc_act(this)" onChange="sc_checkrange(); sc_twodigits()" onBlur="sc_check_int(this)"> :
     <input value="00" type="text" size="2" name="min"  onClick="sc_act(this)" onChange="sc_checkrange(); sc_twodigits()" onBlur="sc_check_int(this)"> :
     <input value="00" type="text" size="2" name="sec"  onClick="sc_act(this)" onChange="sc_checkrange(); sc_twodigits()" onBlur="sc_check_int(this)">
-    <a href="#" onMouseDown="sc_start('-')" onMouseUp="sc_stop()" onMouseOut="sc_stop()">-</a>
-    <a href="#" onMouseDown="sc_start('+')" onMouseUp="sc_stop()" onMouseOut="sc_stop()">+</a>
+    <a href="#" onClick="sc_change('-')" onMouseDown="sc_start('-')" onMouseUp="sc_stop()" onMouseOut="sc_stop()">-</a>
+    <a href="#" onClick="sc_change('+')" onMouseDown="sc_start('+')" onMouseUp="sc_stop()" onMouseOut="sc_stop()">+</a>
 
     <br>
     <input type="button" value="schedule" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.uploadPlaylistMethod&gunid='+schedule_it.gunid.value+'&time='+schedule_it.hour.value+':'+schedule_it.min.value+':'+schedule_it.sec.value)">
@@ -25,7 +25,7 @@ var sc_loop;
 
 function sc_start(direction)
 {
-    sc_loop = setInterval("sc_change('" + direction + "')", 80);
+    sc_loop = setInterval("sc_change('" + direction + "')", 150);
 }
 
 function sc_stop()
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
index 414206687..686cd294d 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
@@ -3,39 +3,31 @@
 <table border=1>
 
 <tr>
+    <td rowspan="2"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> </td>
     {foreach from=$SCHEDULER->Week item="_Weekday"}
         <td>{$_Weekday.label.full}</td>
     {/foreach}
+    <td rowspan="2"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=%2B%2B')">>></a></td>
 </tr>
 
+<tr>
 {foreach from=$SCHEDULER->Week item="_Day"}
-    {if $_Day.isFirst}
-        <tr>
-    {/if}
-
-    {if $_Day.isEmpty}
-        <td>&nbsp;</td>
-    {else}
-        <td valign="top">
-            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')"><b>{$_Day.day}</b></a>
+    <td valign="top">
+        <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>
+        {if $_Day.isSelected}
             {assign var="_oneday" value=$SCHEDULER->getDayUsage($_Day.year, $_Day.month, $_Day.day)}
-            {if is_array($_oneday)}
-                <table border="1" style="font-family : monospace">
-                {foreach from=$_oneday item="i"}
-                    <tr><td>
-                    Start:{$i.start|regex_replace:"/[0-9]+T/":""}
-                    <br>
-                    End:&nbsp;&nbsp;{$i.end|regex_replace:"/[0-9]+T/":""}
-                    </td></tr>
-                {/foreach}
-                </table>
-            {/if}
-        </td>
-    {/if}
-
-    {if $_Day.isLast}
-        </tr>
-    {/if}
+            <table border="1" style="font-family : monospace">
+            {foreach from=$_oneday item="i"}
+                <tr><td>
+                Start:{$i.start|regex_replace:"/[0-9]+T/":""}
+                <br>
+                End:&nbsp;&nbsp;{$i.end|regex_replace:"/[0-9]+T/":""}
+                </td></tr>
+            {/foreach}
+            </table>
+        {/if}
+    </td>
 {/foreach}
+</tr>
 
 </table>
diff --git a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
index 38ef6d4ff..4fb7c5c9c 100755
--- a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
@@ -31,8 +31,14 @@
             {/foreach}
             <tr style="background-color: {cycle values='#eeeeee, #dadada'}">
                 <td><input type="checkbox" name="all" onClick="form_switchAll('SP')"></th>
-                <td align="center" colspan="2"><a href="#" onClick="form_submit('SP')">[Remove Selected]</a></th>
-                <td align="center" colspan="2"><a href="#" onClick="form_clearAll('SP')">[Clear]</a></th>
+                <td align="center" colspan="2">
+                    <select>
+                        <option>Multiple Action:</option>
+                        <option onClick="form_submit('SP', 'SP.removeItem')">Remove</option>
+                        <option onClick="form_submit('SP', 'PL.addItem')">Add to Playlist</option>
+                    </select>
+                </th>
+                <td align="center" colspan="2"><a href="#" onClick="form_clearAll('SP', 'SP.removeItem')">[Clear]</a></th>
             </tr>
         </table>
     </form>
diff --git a/livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl b/livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl
index 66881f8aa..be9ce3ea0 100755
--- a/livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 {literal}
-function switchUp()
+function pl_switchUp()
 {
     if (Number(document.forms['PL_changeTransition'].elements['duration'].value) < 5000) {
         document.forms['PL_changeTransition'].elements['duration'].value  = Number(document.forms['PL_changeTransition'].elements['duration'].value) + 100;
@@ -9,7 +9,7 @@ function switchUp()
     }
 }
 
-function switchDown()
+function pl_switchDown()
 {
     if (Number(document.forms['PL_changeTransition'].elements['duration'].value) > 99) {
         document.forms['PL_changeTransition'].elements['duration'].value = Number(document.forms['PL_changeTransition'].elements['duration'].value) - 100;
@@ -19,5 +19,18 @@ function switchDown()
         else document.forms['PL_changeTransition'].elements['type'][0].checked = true;
     }  */
 }
+
+var pl_loop;
+
+function pl_start(direction)
+{
+    pl_loop = setInterval("pl_switch"+ direction + "()", 100);
+}
+
+function pl_stop()
+{
+    clearInterval(pl_loop);
+}
+
 {/literal}
 </script>
diff --git a/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
index 4be6e6e62..2f0a209d2 100755
--- a/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
@@ -2,16 +2,16 @@
 
 {literal}
 <script type="text/javascript">
-function form_submit(formname)
+function form_submit(formname, action)
 {
-    var href = '{/literal}{$UI_HANDLER}?act='+formname+'.removeItem{literal}';
+    var href = '{/literal}{$UI_HANDLER}{literal}?act='+action;
     var n;
 
-    for (n=0; n < (document.forms[formname].elements.length-1); n++) {
-        if (document.forms[formname].elements[n].checked) {
+    for (n=0; n < (document.forms[formname].elements.length); n++) {
+        if (document.forms[formname].elements[n].checked && document.forms[formname].elements[n].name!='all') {
             href = href + '&id[]=' + document.forms[formname].elements[n].name;
         }
-    }   
+    }
     hpopup(href);
 }
 
@@ -26,12 +26,12 @@ function form_switchAll(formname)
     }
 }
 
-function form_clearAll(formname)
+function form_clearAll(formname, action)
 {
     if (confirm("{/literal}{tra 0='Are you sure to remove all Items?'}{literal}")) {
         document.forms[formname].elements['all'].checked = true;
         form_switchAll(formname);
-        form_submit(formname);
+        form_submit(formname, action);
     }
 }
 </script>
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
index f33637cb3..a9c23652c 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
@@ -79,6 +79,10 @@ function menu(id) {
             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;
+
+            case "SCHEDULER.schedule":
+                menuHtml = menuHtml + "<tr><td><a class='menu' href='#' onClick=\"hpopup('{/literal}{$UI_HANDLER}{literal}?act=SCHEDULER.set&view=schedule&hour="+id+"')\" "+oF+">&nbsp;Schedule Playlist&nbsp;</a></td></tr>"; 
+            break;
         }
     }
     document.getElementById('menucontainer').innerHTML = menuHeader + menuHtml + menuFooter;
diff --git a/livesupport/modules/htmlUI/var/ui_calendar.class.php b/livesupport/modules/htmlUI/var/ui_calendar.class.php
index d0242835c..755271c5e 100755
--- a/livesupport/modules/htmlUI/var/ui_calendar.class.php
+++ b/livesupport/modules/htmlUI/var/ui_calendar.class.php
@@ -44,16 +44,11 @@ class uiCalendar
     {
         if (is_array($this->Month)) return FALSE;
 
-        require_once 'Calendar/Calendar.php';
         require_once 'Calendar/Month/Weekdays.php';
         require_once 'Calendar/Day.php';
 
         $Month = new Calendar_Month_Weekdays($this->curr['year'], $this->curr['month'], $this->firstDayOfWeek);
-        # mark today #
-        $sel =   new Calendar_Day($this->curr['year'], $this->curr['month'], $this->curr['day']);
-        $selections = array($sel);
-
-        $Month->build($selections);
+        $Month->build($this->_scheduledDays('month'));                                                       ## scheduled days are selected
         while ($Day = $Month->fetch()) {
             $corrMonth = $Day->thisMonth()<=12 ? $this->Base->_twoDigits($Day->thisMonth()) : '01';   ## due to bug in
             $corrYear  = $Day->thisMonth()<=12 ? $Day->thisYear() : $Day->thisYear()+1;               ## Calendar_Month_Weekdays
@@ -67,7 +62,7 @@ class uiCalendar
                                 'isFirst'       => $Day->isFirst(),
                                 'isLast'        => $Day->isLast(),
                                 'isSelected'    => $Day->isSelected(),
-                                'isScheduled'   => $this->getDayUsagePercentage($corrYear, $corrMonth, $this->Base->_twoDigits($Day->thisDay()))
+                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE
                              );
         }
     }
@@ -80,7 +75,7 @@ class uiCalendar
         require_once 'Calendar/Week.php';
 
         $Week = new Calendar_Week ($this->curr['year'], $this->curr['month'], $this->curr['day'], $this->firstDayOfWeek);
-        $Week->build();
+        $Week->build($this->_scheduledDays('week'));
         while ($Day = $Week->fetch()) {
             $this->Week[] = array(
                                 'day'           => $this->Base->_twoDigits($Day->thisDay()),
@@ -88,9 +83,10 @@ class uiCalendar
                                 'month'         => $this->Base->_twoDigits($Day->thisMonth()),
                                 'year'          => $Day->thisYear(),
                                 'label'         => $this->_getDayName($Day),
+                                'isSelected'    => $Day->isSelected(),
+                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE
                             );
         }
-
     }
 
 
diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php
index 4793aeb51..02f1d6069 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -82,7 +82,7 @@ class uiPlaylist
         $this->activate($tmpid, FALSE);
         $this->Base->_retMsg('Playlist "$1" saved', $this->Base->_getMDataValue($tmpid, UI_MDATA_KEY_TITLE));
 
-        return TRUE;
+        return $this->activeId;
     }
 
 
@@ -120,14 +120,23 @@ class uiPlaylist
         return FALSE;
     }
 
-    function addItem($id)
+    function addItem($elemIds)
     {
-        $r = $this->Base->gb->addAudioClipToPlaylist($this->token, $id, $this->Base->sessid);
-        if (PEAR::isError($r)) {
-            print_r($r);
-            $this->Base->_retMsg('Cannot add Item to Playlist');
+        if (!$elemIds) {
+            $this->Base->_retMsg('No Item(s) given');
             return FALSE;
         }
+        if (!is_array($elemIds))
+            $elemIds = array($elemIds);
+
+        foreach ($elemIds as $elemId) {
+            $r = $this->Base->gb->addAudioClipToPlaylist($this->token, $elemId, $this->Base->sessid);
+            if (PEAR::isError($r)) {
+                print_r($r);
+                $this->Base->_retMsg('Cannot add Item to Playlist');
+                return FALSE;
+            }
+        }
         return TRUE;
     }
 
@@ -239,8 +248,17 @@ class uiPlaylist
             break;
         }
         #print_r($item);
-        foreach ($item as $i=>$val)
-            $this->Base->gb->changeFadeInfo($this->token, $i, $val['fadeIn'], $val['fadeOut'], $this->Base->sessid);
+        foreach ($item as $i=>$val) {
+            if ($this->Base->gb->changeFadeInfo($this->token, $i, $val['fadeIn'], $val['fadeOut'], $this->Base->sessid) === FALSE)
+                $this->Base->_retMsg('Feiled: changeFadeInfo');
+                return FALSE;
+        }
+    }
+
+
+    function moveItem($id, $pos)
+    {
+        $this->Base->gb->moveAudioClipInPlaylist($this->token, $id, $pos, $this->Base->sessid);
     }
 
 
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
index fe2323447..061783d4e 100755
--- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
@@ -9,6 +9,7 @@ class uiScheduler extends uiCalendar
             $this->curr['year']     = date("Y");
             $this->curr['month']    = date("m");
             $this->curr['day']      = date('d');
+            $this->curr['hour']     = date('H');
         }
 
         $this->Base =& $uiBase;
@@ -29,32 +30,34 @@ class uiScheduler extends uiCalendar
         extract($arr);
         if ($view)  $this->curr['view'] = $view;
         if ($year)  $this->curr['year'] = $year;
-        if (is_numeric($month)) $this->curr['month'] = $month;
-        if ($month=='++') {
-            if ($this->curr['month']==12) {
-                $this->curr['month'] = '01';
-                $this->curr['year']++;
-            } else {
-                $this->curr['month'] = $this->Base->_twoDigits(++$this->curr['month']);
-            }
-        }
-        if ($month=='--') {
-            if ($this->curr['month']=='01') {
-                $this->curr['month'] = 12;
-                $this->curr['year']--;
-            } else {
-                 $this->curr['month'] = $this->Base->_twoDigits(--$this->curr['month']);
-            }
-        }
-        if ($day)   $this->curr['day']  = $day;
-        if ($hour)  $this->curr['hour'] = $hour;
+        if ($day)   $this->curr['day']  = $this->Base->_twoDigits($day);
+        if ($hour)  $this->curr['hour'] = $this->Base->_twoDigits($hour);
+        if (is_numeric($month))
+                    $this->curr['month'] = $this->Base->_twoDigits($month);
+
+        $stampNow    = $this->_datetime2timestamp($this->curr['year'].$this->curr['month'].$this->curr['day']);
+        $stampTarget = $stampNow;
+
+        if ($month=='++')
+            $stampTarget = strtotime("+1 month", $stampNow);
+        if ($month=='--')
+            $stampTarget = strtotime("-1 month", $stampNow);
+
+        if ($week=='++')
+            $stampTarget = strtotime("+1 week", $stampNow);
+        if ($week=='--')
+            $stampTarget = strtotime("-1 week", $stampNow);
+
+        $this->curr['year']     = strftime("%Y", $stampTarget);
+        $this->curr['month']    = strftime("%m", $stampTarget);
+        $this->curr['day']      = strftime("%d", $stampTarget);
     }
 
 
     function _datetime2timestamp($i)
     {
         $formatted = $i[0].$i[1].$i[2].$i[3].'-'.$i[4].$i[5].'-'.$i[6].$i[7].strrchr($i, 'T');
-        #echo $formatted;
+        #echo "iiiii: $i ffff:".$formatted;
         return strtotime($formatted);
     }
 
@@ -87,11 +90,75 @@ class uiScheduler extends uiCalendar
         return $this->_duration[$year.$month.$day];
     }
 
-    function getPeriodicUsage($start, $end)
-    {
 
+    function _scheduledDays($period)
+    {
+        if ($period=='month') {
+            require_once 'Calendar/Month/Weekdays.php';
+            $Period = new Calendar_Month_Weekdays($this->curr['year'], $this->curr['month'], $this->firstDayOfWeek);
+            $Period->build();
+        }
+        if ($period=='week') {
+            require_once 'Calendar/Week.php';
+            $Period = new Calendar_Week ($this->curr['year'], $this->curr['month'], $this->curr['day'], $this->firstDayOfWeek);
+            $Period->build();
+        }
+        $d = $Period->fetch();
+        $corrMonth = $d->thisMonth()<=12 ? $this->Base->_twoDigits($d->thisMonth()) : '01';   ## due to bug in
+        $corrYear  = $d->thisMonth()<=12 ? $d->thisYear() : $d->thisYear()+1;                  ## Calendar_Month_Weekdays
+        $first = array('day'   => $this->Base->_twoDigits($d->thisDay()),
+                       'month' => $corrMonth,
+                       'year'  => $corrYear
+                 );
+
+        while ($l = $Period->fetch()) {
+            $d = $l;
+        }
+        $corrMonth = $d->thisMonth()<=12 ? $this->Base->_twoDigits($d->thisMonth()) : '01';   ## due to bug in
+        $corrYear  = $d->thisMonth()<=12 ? $d->thisYear() : $d->thisYear()+1;                  ## Calendar_Month_Weekdays
+        $last = array('day'   => $this->Base->_twoDigits($d->thisDay()),
+                      'month' => $corrMonth,
+                      'year'  => $corrYear
+                );
+
+
+        #echo "F:".$first['year'].$first['month'].$first['day']." L:".$last['year'].$last['month'].$last['day'];
+        $days = $this->_reciveScheduledDays($first['year'].$first['month'].$first['day'], $last['year'].$last['month'].$last['day']);
+        foreach ($days as $val) {
+            $selections[] = new Calendar_Day($val['year'], $val['month'], $val['day']);
+        }
+        return $selections;
     }
 
+
+    function _reciveScheduledDays($dfrom, $dto)
+    {
+        $dfrom = $dfrom.'T00:00:00';
+        $dto   = $dto.'T23:59:59';
+        $pArr  = $this->displayScheduleMethod($dfrom, $dto);
+        #print_r($pArr);
+        foreach ($pArr as $val) {
+            #print_r($val);
+            $pStampArr[] = array('start' => $this->_datetime2timestamp($val['start']),
+                                 'end'   => $this->_datetime2timestamp($val['end']));
+        }
+        if (is_array($pStampArr)) {
+            #print_r($pStampArr);
+            for ($n=$this->_datetime2timestamp($dfrom); $n<=$this->_datetime2timestamp($dto); $n+=86400) {
+                foreach ($pStampArr as $val) {
+                    if ($val['start'] < $n+86400 && $val['end'] >= $n) {
+                        $days[date('Ymd', $n)] = array('year'  => date('Y', $n),
+                                                                       'month' => date('m', $n),
+                                                                       'day'   => date('d', $n));
+                    }
+                }
+            }
+            return $days;
+        }
+        return array(FALSE);
+    }
+
+
     function copyPlFromSP()
     {
         foreach ($this->Base->SCRATCHPAD->get() as $val) {
@@ -112,18 +179,19 @@ class uiScheduler extends uiCalendar
     {
         $gunid = $formdata['gunid'];
         $datetime = $this->curr['year'].$this->curr['month'].$this->curr['day'].'T'.$formdata['time'];
-        #echo $datetime;
+        #echo "Schedule Gunid: $gunid  At: ".$datetime;
         $r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime.UI_TIMEZONE);
         #print_r($r);
         if (is_array($r['error']))
-            $this->Base->_retMsg('Eroor: $1', $r['error']['message']);
+            $this->Base->_retMsg('Error: $1', $r['error']['message']);
         if (isset($r['scheduleEntryId']))
             $this->Base->_retMsg('ScheduleId: $1', $r['scheduleEntryId']);
     }
 
 
     function displayScheduleMethod($from, $to)
-    {     #echo $from.$to;
+    {
+        #echo $from.$to;
         $r = $this->spc->displayScheduleMethod($this->Base->sessid, $from, $to);
         return $r;
     }
diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
index a2ab4db4f..61db83ca0 100755
--- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
@@ -18,6 +18,7 @@ class uiScratchPad
     {
         if (!is_array($this->items))
             $this->_load();
+        #print_r($this->items);
         return $this->items;
     }