diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php
index ee0f0ea72..e986324c6 100755
--- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php
@@ -1,733 +1,732 @@
-<?php
-$ui_fmask = array(
-    /* ===================== list of system preferences which can be adjusted */
-    'stationPrefs'   => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'changeStationPrefs'
-        ),
-        array(
-            'element'   => 'basics',
-            'type'      => 'header',
-            'label'     => 'Station Settings',
-        ),
-        array(
-            'rule'      => 'nopunctuation',
-            'element'   => 'stationMaxfilesize',
-        ),
-        array(
-            'element'   => 'stationFrequency',
-            'isPref'    => TRUE,
-            'type'      => 'text',
-            'label'     => 'Frequency',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   => 'stationName',
-            'isPref'    => TRUE,
-            'type'      => 'text',
-            'label'     => 'Station Name',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   => 'stationLogoPath',
-            'isPref'    => TRUE,
-            'type'      => 'hidden',
-            'label'     => 'Station Logo path',
-            'default'   => 'img/stationlogo.image',
-            'required'  => TRUE,
-        ),
-        array(
-            'rule'      => 'regex',
-            'element'   => 'stationLogoPath',
-            'format'    => '/^img\/[a-z0-9.-_]*$/',
-            'rulemsg'   => 'Path seems invalid'
-        ),
-        array(
-            'element'   => 'stationURL',
-            'isPref'    => TRUE,
-            'type'      => 'text',
-            'label'     => 'Station URL',
-            'default'   => 'http://',
-            'required'  => TRUE
-        ),
-        array(
-            'rule'      => 'regex',
-            'element'   => 'stationURL',
-            'format'    => UI_REGEX_URL,
-            'rulemsg'   => 'URL seems not to be valid'
-        ),
-        array(
-            'element'   => 'stationlogo',
-            'type'      => 'file',
-            'label'     => 'Station Logo',
-            'requiredmsg'=> 'please select Logo file',
-            'attributes'=> array('multiple' => 'application/pdf')
-        ),
-        array(
-            'element'   => 'systemsettings',
-            'type'      => 'header',
-            'label'     => 'System Settings'
-        ),
-        array(
-            'element'   => UI_SCRATCHPAD_MAXLENGTH_KEY,
-            'isPref'    => TRUE,
-            'type'      => 'select',
-            'label'     => 'Maximun length of ScratchPad',
-            'options'   => array(
-                            5   => 5,
-                            10  => 10,
-                            25  => 25
-                           )
-        ),
-        array(
-            'element'   => 'stationMaxfilesize',
-            'isPref'    => TRUE,
-            'type'      => 'text',
-            'label'     => 'Reduce Upload Filesize<br><small>(must be smaller than ' .ini_get('upload_max_filesize').')</small>',
-            'rule'      => 'numeric',
-            'attributes'   => array(
-                                'onClick'  => 'alert ("Note: System Maximum is set to '.
-                                                ini_get('upload_max_filesize')
-                                                .' in php.ini\n You can just reduce this amount here.")'
-                           )
-        ),
-        array(
-            'element'   =>'Submit',
-            'type'      =>'submit',
-            'label'     =>'Submit'
-        )
-    ),
-
-    'chgPasswd' => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'default'   => 'chgPasswd'
-        ),
-        array(
-            'element'   => 'uid',
-            'type'      => 'hidden',
-        ),
-        array(
-            'element'   => 'oldpass',
-            'type'      => 'password',
-            'label'     => 'Old Password',
-            'required'  => TRUE,
-        ),
-        array(
-            'element'   => 'pass',
-            'type'      => 'password',
-            'label'     => 'New Password',
-            'required'  => TRUE,
-        ),
-        array(
-            'element'   => 'pass2',
-            'type'      => 'password',
-            'label'     => 'Retype Password',
-            'required'  => TRUE,
-        ),
-        array(
-            'rule'      => 'compare',
-            'element'   => array('pass','pass2'),
-            'rulemsg'   => 'The Passwords do not match'
-        ),
-        array(
-            'element'   =>'Submit',
-            'type'      =>'submit',
-            'label'     =>'Submit'
-        )
-
-    ),
-
-    'addUser' => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'addUser'
-        ),
-        array(
-            'element'   => 'login',
-            'type'      => 'text',
-            'label'     => 'Username',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   =>'pass',
-            'type'      =>'password',
-            'label'     =>'Users Password',
-            'required'  =>TRUE
-        ),
-        array(
-            'element'   =>'pass2',
-            'type'      =>'password',
-            'label'     =>'Repeat Password',
-            'required'  =>TRUE
-        ),
-        array(
-            'rule'      =>'compare',
-            'element'   =>array('pass','pass2'),
-            'rulemsg'   =>'The Passwords do not match'
-        ),
-        array(
-            'element'   =>'Submit',
-            'type'      =>'submit',
-            'label'     =>'Submit'
-        )
-    ),
-
-    'addGroup' => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'addGroup'
-        ),
-        array(
-            'element'   => 'login',
-            'type'      => 'text',
-            'label'     => 'Group Name',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   =>'Submit',
-            'type'      =>'submit',
-            'label'     =>'Submit'
-        )
-    ),
-
-    'login' => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'login'
-        ),
-        array(
-            'element'   => 'login',
-            'type'      => 'text',
-            'label'     => 'Username',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   => 'pass',
-            'type'      => 'password',
-            'label'     => 'Password',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   => 'cancel',
-            'type'      => 'button',
-            'label'     => 'Cancel',
-            'attributes'=> array('onClick' => 'window.close()'),
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'Submit',
-            'type'      => 'submit',
-            'label'     => 'Submit',
-            'groupit'   => TRUE
-        ),
-        array(
-            'group'     => array('cancel', 'Submit')
-        ),
-    ),
-
-    'uploadFileM'    => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'id',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'mediafile',
-            'type'      => 'file',
-            'label'     => 'Mediafile',
-            'required'  => TRUE,
-            'requiredmsg'=> 'please select Media file'
-        ),
-        array(
-            'element'   => 'mdatafile',
-            'type'      => 'file',
-            'label'     => 'Metadata',
-            'required'  => TRUE,
-            'requiredmsg'=> 'please select Metadata file'
-        ),
-        array(
-            'element'   => 'Submit',
-            'type'      => 'submit',
-            'label'     => 'Submit'
-        )
-    ),
-
-    'file'          => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'id',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'folderId',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'mediafile',
-            'type'      => 'file',
-            'label'     => 'Mediafile',
-            'required'  => TRUE,
-            'requiredmsg'=> 'please select Media file'
-        ),
-        array(
-            'element'   => 'cancel',
-            'type'      => 'button',
-            'label'     => 'Cancel',
-            'attributes'=> array(
-                'class'=> "button",
-                'onClick'  => "location.href='".UI_BROWSER."'"),
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'Submit',
-            'type'      => 'submit',
-            'label'     => 'Submit',
-            'groupit'   => TRUE,
-            'attributes' => array(
-                'class'=> "button",
-                ),
-        ),
-        array(
-            'group'     => array('cancel', 'Submit')
-        )
-    ),
-
-    'webstream'     => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-        ),
-        array(
-            'element'   => 'id',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'folderId',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'title',
-            'type'      => 'text',
-            'label'     => 'Title',
-            'required'  => TRUE
-        ),
-        array(
-            'element'   => 'url',
-            'type'      => 'text',
-            'label'     => 'Stream URL',
-            'required'  => TRUE,
-            'requiredmsg'=> 'URL is missing',
-            'rule'      => 'regex',
-            'format'    => UI_REGEX_URL,
-            'rulemsg'   => 'URL seems invalid',
-        ),
-        array(
-            'element'   => 'length',
-            'type'      => 'date',
-            'label'     => 'Length<br><small>Leave zero for Live Stream</small>',
-            'options'   => array('format' => 'His'),
-        ),
-        array(
-            'element'   => 'cancel',
-            'type'      => 'button',
-            'label'     => 'Cancel',
-            'attributes'=> array('onClick'  => "location.href='".UI_BROWSER."'"),
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'Submit',
-            'type'      => 'submit',
-            'label'     => 'Submit',
-            'groupit'   => TRUE
-        ),
-        array(
-            'group'     => array('cancel', 'Submit')
-        )
-    ),
-
-    'search'    => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'SEARCH.newSearch'
-        ),
-        array(
-            'element'   => 'id',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'counter',
-            'type'      => 'hidden'
-        ),
-        array(
-            'element'   => 'max_rows',
-            'type'      => 'hidden',
-            'constant'  => UI_SEARCH_MAX_ROWS
-        ),
-        array(
-            'element'   => 'operator',
-            'type'      => 'select',
-            'label'     => 'Operator',
-            'options'   => array(
-                            'or'    => 'Or',
-                            'and'   => 'And',
-                            )
-        ),
-        array(
-            'element'   => 'filetype',
-            'type'      => 'select',
-            'label'     => 'Filetype',
-            'options'   => array(
-                            'File'      => '*',
-                            'audioclip' => 'Audioclip',
-                            'webstream' => 'Webstream',
-                            'playlist'  => 'Playlist'
-                            )
-        ),
-        array(
-            'element'   => 'limit',
-            'type'      => 'select',
-            'label'     => 'Rows per Page',
-            'options'   => array(
-                            10  => 10,
-                            25  => 25,
-                            50  => 50,
-                            100 => 100
-                           )
-        ),
-        array(
-            'element'   => 'clear',
-            'type'      => 'button',
-            'label'     => 'Reset',
-            'attributes'  => array('onClick' => "this.form.reset(); hpopup('".UI_HANDLER."?act=SEARCH.clear', 'SF')"),
-            'groupit'   => TRUE,
-        ),
-        array(
-            'element'   => 'addrow',
-            'type'      => 'button',
-            'label'     => 'One more Row',
-            'attributes'  => array('onClick' => 'SearchForm_addRow()'),
-            'groupit'   => TRUE,
-        ),
-        array(
-            'element'   => 'submit',
-            'type'      => 'submit',
-            'label'     => 'Submit',
-            'groupit'   => TRUE,
-        ),
-        array('group'   => array('clear', 'addrow', 'submit')
-        ),
-    ),
-
-    'relations'     => array(
-        'standard'    => array(
-                'partial'    => 'partial',
-                'full'       => 'full',
-                'prefix'     => 'prefix',
-                '='          => '=' ,
-                '<'         => '<',
-                '<='        => '<=',
-                '>'         => '>',
-                '>='        => '>='
-        ),
-        1             => array(
-                'partial'    => 'partial',
-                'full'       => 'full',
-                'prefix'     => 'prefix',
-                '='          => '='
-        ),
-
-    ),
-
-    'languages'    => array(
-            array(
-                'element'  => 'langid',
-                'type'     => 'select',
-                'label'    => 'Language',
-                'options'  => array(
-                                'en.English'    => 'English',
-                                'nl.Dutch'      => 'Dutch',
-                                'cz.Czech'      => 'Czech',
-                                'de.German'     => 'German',
-                                'hu.Hungarian'  => 'Hungarian',
-                                'sr.Serbian'    => 'Serbian'
-                              )
-            )
-    ),
-
-    'browse_columns'    => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-        ),
-        array(
-            'element'   => 'id',
-            'type'      => 'hidden'
-        ),
-        'form'      => array(
-            'element'   => 'col',
-            'type'      => 'hidden'
-        ),
-        'category'  => array(
-            'element'   => 'category',
-            'type'      => 'select',
-            'label'     => 'Category',
-            'attributes'=> array(
-                'onChange'  => 'this.form.act.value="BROWSE.setCategory"; this.form.submit()',
-                'style'     => 'width: 180px;',
-                'id'        => 'category_1'
-                )
-        ),
-        'value'      => array(
-            'element'   => 'value',
-            'type'      => 'select',
-            'multiple'  => TRUE,
-            'attributes'=> array(
-                'size'      => 10,
-                'class'     => 'area_browse',
-                'onChange'  => 'this.form.act.value="BROWSE.setValue"; this.form.submit()'
-            )
-        )
-    ),
-
-    'browse_global'  => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-        ),
-        array(
-            'element'   => 'filetype',
-            'type'      => 'select',
-            'label'     => 'Filetype',
-            'options'   => array(
-                            'File'      => '*',
-                            'audioclip' => 'Audioclip',
-                            'webstream' => 'Webstream',
-                            'playlist'  => 'Playlist'
-                            ),
-            'attributes'=> array('onChange' =>  'hpopup("'.UI_HANDLER.'?act=BROWSE.setFiletype&filetype=" + this.form.filetype.value)')
-        ),
-        array(
-            'element'   => 'limit',
-            'type'      => 'select',
-            'label'     => 'Rows per Page',
-            'options'   => array(
-                            10  => 10,
-                            25  => 25,
-                            50  => 50,
-                            100 => 100
-                           ),
-            'attributes'=> array('onChange' => 'hpopup("'.UI_HANDLER.'?act=BROWSE.setLimit&limit=" + this.form.limit.value)')
-        )
-    ),
-
-    'simplesearch'  => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'SEARCH.simpleSearch'
-        ),
-        array(
-            'element'   => 'simplesearch',
-            'type'      => 'header',
-            'label'     => 'Library Search',
-        ),
-        array(
-            'element'   => 'criterium',
-            'type'      => 'text',
-            'label'     => NULL,
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'submit',
-            'type'      => 'submit',
-            'label'     => 'Search',
-            'groupit'   => TRUE
-        ),
-        array(
-            'group'     => array('criterium', 'submit')
-        )
-    ),
-
-    'PL.changeTransition'  => array(
-        'transition' => array(
-            array(
-                'element'   => 'headline',
-                'type'      => 'static'
-            ),
-            /*
-            array(
-                'element'   => 'type',
-                'type'      => 'radio',
-                'label'     => 'Type',
-                'options'   => array(
-                                'fadeX'      => 'Crossfade',
-                                'pause'      => 'Pause'
-                               ),
-                'default'   => 'fadeX'
-            )  */
-            array(
-                'element'   => 'type',
-                'type'      => 'hidden',
-                'default'   => 'fadeX'
-            ),
-        ),
-        'fadeIn' => array(
-            array(
-                'element'   => 'headline',
-                'type'      => 'static'
-            ),
-            /*
-            array(
-                'element'   => 'type',
-                'type'      => 'radio',
-                'label'     => 'Type',
-                'options'   => array('fadeIn' => 'Fade in'),
-                'default'   => 'fadeIn'
-            )  */
-            array(
-                'element'   => 'type',
-                'type'      => 'hidden',
-                'default'   => 'fadeIn'
-            ),
-
-        ),
-        'fadeOut' => array(
-            array(
-                'element'   => 'headline',
-                'type'      => 'static'
-            ),
-            /*
-            array(
-                'element'   => 'type',
-                'type'      => 'radio',
-                'label'     => 'Type',
-                'options'   => array('fadeOut' => 'Fade out'),
-                'default'   => 'fadeOut'
-            )    */
-            array(
-                'element'   => 'type',
-                'type'      => 'hidden',
-                'default'   => 'fadeOut'
-            ),
-        ),
-        'all'   => array(
-            array(
-                'element'   => 'act',
-                'type'      => 'hidden',
-                'constant'  => 'PL.changeTransition'
-            ),
-            array(
-                'element'   => 'id',
-                'type'      => 'hidden'
-            ),
-            array(
-                'element'   => 'duration',
-                'type'      => 'text',
-                'rule'      => 'numeric',
-                'attributes'=> array('size' => 4, 'maxlength' => 4),
-                'groupit'   => TRUE
-            ),
-            array(
-                'element'   => 'switchdown',
-                'type'      => 'button',
-                'label'     => '-',
-                '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' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
-                'groupit'   => TRUE
-            ),
-            array(
-                'group'     => array('duration', 'switchdown', 'switchup'),
-                'label'     => 'Duration'
-            ),
-            array(
-                'element'   => 'cancel',
-                'type'      => 'button',
-                'label'     => 'Cancel',
-                'attributes'=> array('onClick' => 'window.close()'),
-                'groupit'   => TRUE,
-            ),
-            array(
-                'element'   => 'reset',
-                'type'      => 'reset',
-                'label'     => 'Reset',
-                'groupit'   => TRUE,
-            ),
-            array(
-                'element'   => 'submit',
-                'type'      => 'submit',
-                'label'     => 'Submit',
-                'groupit'   => TRUE,
-            ),
-            array(
-                'group'     => array('cancel', 'reset', 'submit')
-            )
-        )
-    ),
-    'schedule'  => array(
-        array(
-            'element'   => 'act',
-            'type'      => 'hidden',
-            'constant'  => 'SCHEDULER.addItem'
-        ),
-        'date'      => array(
-            'element'   => 'date',
-            'type'      => 'date',
-            'label'     => 'Date',
-            'options'   => array('format' => 'Ymd'),
-        ),
-        'time'      => array(
-            'element'   => 'time',
-            'type'      => 'date',
-            'label'     => 'Time',
-            'options'   => array('format' => 'His'),
-        ),
-        'playlist'  => array(
-            'element'   => 'playlist',
-            'type'      => 'select',
-            'label'     => 'Playlist',
-            'required'  => TRUE,
-        ),
-        array(
-            'element'   => 'cancel',
-            'type'      => 'button',
-            'label'     => 'Cancel',
-            'attributes'=> array('onClick' => 'window.close()'),
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'reset',
-            'type'      => 'reset',
-            'label'     => 'Reset',
-            'groupit'   => TRUE
-        ),
-        array(
-            'element'   => 'submit',
-            'type'      => 'submit',
-            'label'     => 'Submit',
-            'groupit'   => TRUE
-        ),
-        array(
-            'group'     => array('cancel', 'reset', 'submit')
-        )
-    )
-);
+<?php
+$ui_fmask = array(
+    /* ===================== list of system preferences which can be adjusted */
+    'stationPrefs'   => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'changeStationPrefs'
+        ),
+        array(
+            'element'   => 'basics',
+            'type'      => 'header',
+            'label'     => 'Station Settings',
+        ),
+        array(
+            'rule'      => 'nopunctuation',
+            'element'   => 'stationMaxfilesize',
+        ),
+        array(
+            'element'   => 'stationFrequency',
+            'isPref'    => TRUE,
+            'type'      => 'text',
+            'label'     => 'Frequency',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   => 'stationName',
+            'isPref'    => TRUE,
+            'type'      => 'text',
+            'label'     => 'Station Name',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   => 'stationLogoPath',
+            'isPref'    => TRUE,
+            'type'      => 'hidden',
+            'label'     => 'Station Logo Path',
+            'default'   => 'img/stationlogo.image',
+            'required'  => TRUE,
+        ),
+        array(
+            'rule'      => 'regex',
+            'element'   => 'stationLogoPath',
+            'format'    => '/^img\/[a-z0-9.-_]*$/',
+            'rulemsg'   => 'Path appears invalid'
+        ),
+        array(
+            'element'   => 'stationURL',
+            'isPref'    => TRUE,
+            'type'      => 'text',
+            'label'     => 'Station URL',
+            'default'   => 'http://',
+            'required'  => TRUE
+        ),
+        array(
+            'rule'      => 'regex',
+            'element'   => 'stationURL',
+            'format'    => UI_REGEX_URL,
+            'rulemsg'   => 'URL seems not to be valid'
+        ),
+        array(
+            'element'   => 'stationlogo',
+            'type'      => 'file',
+            'label'     => 'Station Logo',
+            'requiredmsg'=> 'please select Logo file',
+            'attributes'=> array('multiple' => 'application/pdf')
+        ),
+        array(
+            'element'   => 'systemsettings',
+            'type'      => 'header',
+            'label'     => 'System Settings'
+        ),
+        array(
+            'element'   => UI_SCRATCHPAD_MAXLENGTH_KEY,
+            'isPref'    => TRUE,
+            'type'      => 'select',
+            'label'     => 'Maximum length of ScratchPad',
+            'options'   => array(
+                            5   => 5,
+                            10  => 10,
+                            25  => 25
+                           )
+        ),
+        array(
+            'element'   => 'stationMaxfilesize',
+            'isPref'    => TRUE,
+            'type'      => 'text',
+            'label'     => 'Reduce Upload Filesize',
+            'rule'      => 'numeric',
+            'attributes'   => array(
+                                'onFocus'  => 'alert ("'.tra('Note: System Maximum is set to $1 in php.ini. You can just reduce this amount here.',
+                                                            ini_get('upload_max_filesize')).'")'
+                           )
+        ),
+        array(
+            'element'   =>'Submit',
+            'type'      =>'submit',
+            'label'     =>'Submit'
+        )
+    ),
+
+    'chgPasswd' => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'default'   => 'chgPasswd'
+        ),
+        array(
+            'element'   => 'uid',
+            'type'      => 'hidden',
+        ),
+        array(
+            'element'   => 'oldpass',
+            'type'      => 'password',
+            'label'     => 'Old Password',
+            'required'  => TRUE,
+        ),
+        array(
+            'element'   => 'pass',
+            'type'      => 'password',
+            'label'     => 'New Password',
+            'required'  => TRUE,
+        ),
+        array(
+            'element'   => 'pass2',
+            'type'      => 'password',
+            'label'     => 'Retype Password',
+            'required'  => TRUE,
+        ),
+        array(
+            'rule'      => 'compare',
+            'element'   => array('pass','pass2'),
+            'rulemsg'   => 'The passwords do not match'
+        ),
+        array(
+            'element'   =>'Submit',
+            'type'      =>'submit',
+            'label'     =>'Submit'
+        )
+
+    ),
+
+    'addUser' => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'addUser'
+        ),
+        array(
+            'element'   => 'login',
+            'type'      => 'text',
+            'label'     => 'Username',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   =>'pass',
+            'type'      =>'password',
+            'label'     =>'User Password',
+            'required'  =>TRUE
+        ),
+        array(
+            'element'   =>'pass2',
+            'type'      =>'password',
+            'label'     =>'Repeat Password',
+            'required'  =>TRUE
+        ),
+        array(
+            'rule'      =>'compare',
+            'element'   =>array('pass','pass2'),
+            'rulemsg'   =>'The passwords do not match'
+        ),
+        array(
+            'element'   =>'Submit',
+            'type'      =>'submit',
+            'label'     =>'Submit'
+        )
+    ),
+
+    'addGroup' => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'addGroup'
+        ),
+        array(
+            'element'   => 'login',
+            'type'      => 'text',
+            'label'     => 'Group Name',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   =>'Submit',
+            'type'      =>'submit',
+            'label'     =>'Submit'
+        )
+    ),
+
+    'login' => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'login'
+        ),
+        array(
+            'element'   => 'login',
+            'type'      => 'text',
+            'label'     => 'Username',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   => 'pass',
+            'type'      => 'password',
+            'label'     => 'Password',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick' => 'window.close()'),
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'Submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'Submit')
+        ),
+    ),
+
+    'uploadFileM'    => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'id',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'mediafile',
+            'type'      => 'file',
+            'label'     => 'Media File',
+            'required'  => TRUE,
+            'requiredmsg'=> 'Please select media file'
+        ),
+        array(
+            'element'   => 'mdatafile',
+            'type'      => 'file',
+            'label'     => 'Metadata',
+            'required'  => TRUE,
+            'requiredmsg'=> 'Please select metadata file'
+        ),
+        array(
+            'element'   => 'Submit',
+            'type'      => 'submit',
+            'label'     => 'Submit'
+        )
+    ),
+
+    'file'          => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'id',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'folderId',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'mediafile',
+            'type'      => 'file',
+            'label'     => 'Media File',
+            'required'  => TRUE,
+            'requiredmsg'=> 'please select media file'
+        ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array(
+                'class'=> "button",
+                'onClick'  => "location.href='".UI_BROWSER."'"),
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'Submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE,
+            'attributes' => array(
+                'class'=> "button",
+                ),
+        ),
+        array(
+            'group'     => array('cancel', 'Submit')
+        )
+    ),
+
+    'webstream'     => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+        ),
+        array(
+            'element'   => 'id',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'folderId',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'title',
+            'type'      => 'text',
+            'label'     => 'Title',
+            'required'  => TRUE
+        ),
+        array(
+            'element'   => 'url',
+            'type'      => 'text',
+            'label'     => 'Stream URL',
+            'required'  => TRUE,
+            'requiredmsg'=> 'URL is missing',
+            'rule'      => 'regex',
+            'format'    => UI_REGEX_URL,
+            'rulemsg'   => 'URL seems invalid',
+        ),
+        array(
+            'element'   => 'length',
+            'type'      => 'date',
+            'label'     => 'Length<br><small>Enter zero for Live Stream</small>',
+            'options'   => array('format' => 'His'),
+        ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick'  => "location.href='".UI_BROWSER."'"),
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'Submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'Submit')
+        )
+    ),
+
+    'search'    => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'SEARCH.newSearch'
+        ),
+        array(
+            'element'   => 'id',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'counter',
+            'type'      => 'hidden'
+        ),
+        array(
+            'element'   => 'max_rows',
+            'type'      => 'hidden',
+            'constant'  => UI_SEARCH_MAX_ROWS
+        ),
+        array(
+            'element'   => 'operator',
+            'type'      => 'select',
+            'label'     => 'Operator',
+            'options'   => array(
+                            'or'    => 'Or',
+                            'and'   => 'And',
+                            )
+        ),
+        array(
+            'element'   => 'filetype',
+            'type'      => 'select',
+            'label'     => 'File type',
+            'options'   => array(
+                            'File'      => '*',
+                            'audioclip' => 'Audio Clip',
+                            'webstream' => 'Web Stream',
+                            'playlist'  => 'Playlist'
+                            )
+        ),
+        array(
+            'element'   => 'limit',
+            'type'      => 'select',
+            'label'     => 'Rows per Page',
+            'options'   => array(
+                            10  => 10,
+                            25  => 25,
+                            50  => 50,
+                            100 => 100
+                           )
+        ),
+        array(
+            'element'   => 'clear',
+            'type'      => 'button',
+            'label'     => 'Reset',
+            'attributes'  => array('onClick' => "this.form.reset(); hpopup('".UI_HANDLER."?act=SEARCH.clear', 'SF')"),
+            'groupit'   => TRUE,
+        ),
+        array(
+            'element'   => 'addrow',
+            'type'      => 'button',
+            'label'     => 'Add Criteria',
+            'attributes'  => array('onClick' => 'SearchForm_addRow()'),
+            'groupit'   => TRUE,
+        ),
+        array(
+            'element'   => 'submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE,
+        ),
+        array('group'   => array('clear', 'addrow', 'submit')
+        ),
+    ),
+
+    'relations'     => array(
+        'standard'    => array(
+                'partial'    => 'partial',
+                'full'       => 'full',
+                'prefix'     => 'prefix',
+                '='          => '=' ,
+                '<'         => '<',
+                '<='        => '<=',
+                '>'         => '>',
+                '>='        => '>='
+        ),
+        1             => array(
+                'partial'    => 'partial',
+                'full'       => 'full',
+                'prefix'     => 'prefix',
+                '='          => '='
+        ),
+
+    ),
+
+    'languages'    => array(
+            array(
+                'element'  => 'langid',
+                'type'     => 'select',
+                'label'    => 'Language',
+                'options'  => array(
+                                'en.English'    => 'English',
+                                'nl.Dutch'      => 'Nederlaands',
+                                'cz.Czech'      => 'Cesky',
+                                'de.German'     => 'Deutsch',
+                                'hu.Hungarian'  => 'Magyar',
+                                'sr.Serbian'    => 'Srpski'
+                              )
+            )
+    ),
+
+    'browse_columns'    => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+        ),
+        array(
+            'element'   => 'id',
+            'type'      => 'hidden'
+        ),
+        'form'      => array(
+            'element'   => 'col',
+            'type'      => 'hidden'
+        ),
+        'category'  => array(
+            'element'   => 'category',
+            'type'      => 'select',
+            'label'     => 'Category',
+            'attributes'=> array(
+                'onChange'  => 'this.form.act.value="BROWSE.setCategory"; this.form.submit()',
+                'style'     => 'width: 180px;',
+                'id'        => 'category_1'
+                )
+        ),
+        'value'      => array(
+            'element'   => 'value',
+            'type'      => 'select',
+            'multiple'  => TRUE,
+            'attributes'=> array(
+                'size'      => 10,
+                'class'     => 'area_browse',
+                'onChange'  => 'this.form.act.value="BROWSE.setValue"; this.form.submit()'
+            )
+        )
+    ),
+
+    'browse_global'  => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+        ),
+        array(
+            'element'   => 'filetype',
+            'type'      => 'select',
+            'label'     => 'File Type',
+            'options'   => array(
+                            'File'      => '*',
+                            'audioclip' => 'Audio Clip',
+                            'webstream' => 'Web Stream',
+                            'playlist'  => 'Playlist'
+                            ),
+            'attributes'=> array('onChange' =>  'hpopup("'.UI_HANDLER.'?act=BROWSE.setFiletype&filetype=" + this.form.filetype.value)')
+        ),
+        array(
+            'element'   => 'limit',
+            'type'      => 'select',
+            'label'     => 'Rows Per Page',
+            'options'   => array(
+                            10  => 10,
+                            25  => 25,
+                            50  => 50,
+                            100 => 100
+                           ),
+            'attributes'=> array('onChange' => 'hpopup("'.UI_HANDLER.'?act=BROWSE.setLimit&limit=" + this.form.limit.value)')
+        )
+    ),
+
+    'simplesearch'  => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'SEARCH.simpleSearch'
+        ),
+        array(
+            'element'   => 'simplesearch',
+            'type'      => 'header',
+            'label'     => 'Search Library',
+        ),
+        array(
+            'element'   => 'criterium',
+            'type'      => 'text',
+            'label'     => NULL,
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'submit',
+            'type'      => 'submit',
+            'label'     => 'Search',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('criterium', 'submit')
+        )
+    ),
+
+    'PL.changeTransition'  => array(
+        'transition' => array(
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            /*
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array(
+                                'fadeX'      => 'Crossfade',
+                                'pause'      => 'Pause'
+                               ),
+                'default'   => 'fadeX'
+            )  */
+            array(
+                'element'   => 'type',
+                'type'      => 'hidden',
+                'default'   => 'fadeX'
+            ),
+        ),
+        'fadeIn' => array(
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            /*
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array('fadeIn' => 'Fade in'),
+                'default'   => 'fadeIn'
+            )  */
+            array(
+                'element'   => 'type',
+                'type'      => 'hidden',
+                'default'   => 'fadeIn'
+            ),
+
+        ),
+        'fadeOut' => array(
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            /*
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array('fadeOut' => 'Fade out'),
+                'default'   => 'fadeOut'
+            )    */
+            array(
+                'element'   => 'type',
+                'type'      => 'hidden',
+                'default'   => 'fadeOut'
+            ),
+        ),
+        'all'   => array(
+            array(
+                'element'   => 'act',
+                'type'      => 'hidden',
+                'constant'  => 'PL.changeTransition'
+            ),
+            array(
+                'element'   => 'id',
+                'type'      => 'hidden'
+            ),
+            array(
+                'element'   => 'duration',
+                'type'      => 'text',
+                'rule'      => 'numeric',
+                'attributes'=> array('size' => 4, 'maxlength' => 4),
+                'groupit'   => TRUE
+            ),
+            array(
+                'element'   => 'switchdown',
+                'type'      => 'button',
+                'label'     => '-',
+                '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' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
+                'groupit'   => TRUE
+            ),
+            array(
+                'group'     => array('duration', 'switchdown', 'switchup'),
+                'label'     => 'Duration'
+            ),
+            array(
+                'element'   => 'cancel',
+                'type'      => 'button',
+                'label'     => 'Cancel',
+                'attributes'=> array('onClick' => 'window.close()'),
+                'groupit'   => TRUE,
+            ),
+            array(
+                'element'   => 'reset',
+                'type'      => 'reset',
+                'label'     => 'Reset',
+                'groupit'   => TRUE,
+            ),
+            array(
+                'element'   => 'submit',
+                'type'      => 'submit',
+                'label'     => 'Submit',
+                'groupit'   => TRUE,
+            ),
+            array(
+                'group'     => array('cancel', 'reset', 'submit')
+            )
+        )
+    ),
+    'schedule'  => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'SCHEDULER.addItem'
+        ),
+        'date'      => array(
+            'element'   => 'date',
+            'type'      => 'date',
+            'label'     => 'Date',
+            'options'   => array('format' => 'Ymd'),
+        ),
+        'time'      => array(
+            'element'   => 'time',
+            'type'      => 'date',
+            'label'     => 'Time',
+            'options'   => array('format' => 'His'),
+        ),
+        'playlist'  => array(
+            'element'   => 'playlist',
+            'type'      => 'select',
+            'label'     => 'Playlist',
+            'required'  => TRUE,
+        ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick' => 'window.close()'),
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'reset',
+            'type'      => 'reset',
+            'label'     => 'Reset',
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'reset', 'submit')
+        )
+    )
+);
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
index c58d89d99..954fd9dfc 100755
--- a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
@@ -150,7 +150,7 @@ $mask = array(
                 'element'   => 'ls:year',
                 'type'      => 'select',
                 'label'     => 'Year',
-                'options'   => _getNumArr(1900, date('Y')+5),
+                #'options'   => _getNumArr(1900, date('Y')+5),
                 'id3'       => 'Year'
             ),
             array(
@@ -208,14 +208,14 @@ $mask = array(
                 'element'   => 'ls:track_num',
                 'type'      => 'select',
                 'label'     => 'Track number',
-                'options'   => _getNumArr(0, 99),
+                #'options'   => _getNumArr(0, 99),
                 'id3'       => 'Track'
             ),
             array(
                 'element'   => 'ls:disc_num',
                 'type'      => 'select',
                 'label'     => 'Disc number',
-                'options'   => _getNumArr(0, 20),
+                #'options'   => _getNumArr(0, 20),
                 'id3'       => 'Disk'
             ),
             array(
diff --git a/livesupport/modules/htmlUI/var/html/styles_livesupport.css b/livesupport/modules/htmlUI/var/html/styles_livesupport.css
index ab92643fa..359e3cf2a 100755
--- a/livesupport/modules/htmlUI/var/html/styles_livesupport.css
+++ b/livesupport/modules/htmlUI/var/html/styles_livesupport.css
@@ -43,6 +43,14 @@ form { font-size: 12px;
     width: 100px;
 }
 
+.button_wide { font-size: 12px;
+    font-weight: bold;
+    color: #666;
+    background-color: #F7F9FB;
+    padding: 0 25px 0 25px;
+    cursor: pointer;
+    width: 150px;
+}
 .button_large { font-size: 12px;
     font-weight: bold;
     color: #666;
diff --git a/livesupport/modules/htmlUI/var/localizer/display.inc.php b/livesupport/modules/htmlUI/var/localizer/display.inc.php
index 3dd40e702..39a299224 100755
--- a/livesupport/modules/htmlUI/var/localizer/display.inc.php
+++ b/livesupport/modules/htmlUI/var/localizer/display.inc.php
@@ -86,7 +86,7 @@ class Display {
                 }
 
                 $html .= "<input name='data[$nr][key]' type='hidden' value=\"$displKey\">";
-                $html .= "<input name='data[$nr][value]' type='text' size='50' value=\"$insval\">";
+                $html .= "<input name='data[$nr][value]' type='text' size='100' value=\"$insval\">";
                 $html .= "</td><td>\n";
 
                 if ($target[Id] == _DEFAULT_LANG_) {     // default language => can change keys
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl b/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl
index 425434a1b..ced440bf5 100755
--- a/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl
+++ b/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl
@@ -10,9 +10,9 @@
 <h1>##Playlist Editor##</h1>
     <p>&nbsp;</p>
     {if $PL->reportLookedPL()}
-        <input type="button" value="##Open last Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.unlook')">
+        <input type="button" value="##Open last Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.unlook')" class="button_wide">
     {else}
-        <input type="button" value="##New empty Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.create')">
+        <input type="button" value="##New empty Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.create')" class="button_wide">
     {/if}
 </div>
 {/if}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
index b3e21b11c..58931b3ed 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl
@@ -9,8 +9,7 @@
             <li><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day')">##Day##</a></li>
             <li><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=week')">##Week##</a></li>
             <li><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=month')">##Month##</a></li>
-            <!-- <input type="button" onClick="popup('{$UI_BROWSER}?popup[]=SCHEDULER.schedule', 'Schedule', 600, 400)" value="Schedule">  -->
-            <li><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&today=1')">##Today##</a></li>
+            <li><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&today=1')">##Today##</a></li>
             </ul>
         </div>
 <!-- end calendar tabs -->
@@ -22,25 +21,22 @@
                     <table class="calender_overview_table">
                         <tr>
                             <td><a href="#" onCLick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=--')"><<</a></td>
-                            <td colspan=4>
-            <form name="calendar_month" style="margin: 2;">
-                <select id="month" style="margin-top: 0;font-size:9px;" name="month" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=' +  document.forms['calendar_month'].month.value)">
+                            <td colspan=6>
+            <form name="calendar" style="margin: 2;">
+                <select id="month" style="margin-top: 0;font-size:9px;" name="month" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=' +  document.forms['calendar'].month.value)">
                 {foreach from=$SCHEDULER->Year item="_Month"}
                     <option value="{$_Month.month}">{$_Month.label.full}</option>
                 {/foreach}
                 </select>
-            </form>
-                            </td>
-                            <td colspan=2>
-            <form name="calendar_year" style="margin: 2;">
-                <select id="year" style="margin-top: 0;font-size:9px;" name="year" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&year=' + document.forms['calendar_year'].year.value)">
+                &nbsp;&nbsp;&nbsp;
+                <select id="year" style="margin-top: 0;font-size:9px;" name="year" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&year=' + document.forms['calendar'].year.value)">
                 {foreach from=$SCHEDULER->Decade item="_Year"}
                     <option value="{$_Year.year}" {if $_Year.isSelected}selected{/if}>{$_Year.year}</option>
                 {/foreach}
                 </select>
                 <script type="text/javascript">
-                     document.forms['calendar_month'].month.value = '{$SCHEDULER->curr.month}';
-                     document.forms['calendar_year'].year.value   = '{$SCHEDULER->curr.year}';
+                     document.forms['calendar'].month.value = '{$SCHEDULER->curr.month}';
+                     document.forms['calendar'].year.value  = '{$SCHEDULER->curr.year}';
                 </script>
             </form>
                             </td>
@@ -71,9 +67,9 @@
                     <td class="nothing">
         {/if}
         {if $_Day.isSelected}
-                        <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')" class="full">{$_Day.day}</a>
+                        <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')" class="full">{$_Day.day}</a>
         {else}
-                        <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.day}</a>
+                        <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.day}</a>
         {/if}
 
                     </td>
@@ -86,68 +82,3 @@
             </div>
 </div>
 <!-- end calendar navigation -->
-
-
-
-{*
-<table border=1>
-    <tr><th colspan="8">{$SCHEDULER->curr.year}-{$SCHEDULER->curr.month}-{$SCHEDULER->curr.day}</th></tr>
-
-    <tr>
-        <th><a href="#" onCLick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=--')"><<</a></th>
-        <th colspan="4">
-            <form name="calendar_month">
-                <select name="month" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=' +  document.forms['calendar_month'].month.value)">
-                {foreach from=$SCHEDULER->Year item="_Month"}
-                    <option value="{$_Month.month}">{$_Month.label.full}</option>
-                {/foreach}
-                </select>
-            </form>
-        </th>
-        <th colspan="2">
-            <form name="calendar_year">
-                <select name="year" onChange="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&year=' + document.forms['calendar_year'].year.value)">
-                {foreach from=$SCHEDULER->Decade item="_Year"}
-                    <option value="{$_Year.year}" {if $_Year.isSelected}selected{/if}>{$_Year.year}</option>
-                {/foreach}
-                </select>
-            </form>
-            <script type="text/javascript">
-                 document.forms['calendar_month'].month.value = '{$SCHEDULER->curr.month}';
-                 document.forms['calendar_year'].year.value   = '{$SCHEDULER->curr.year}';
-            </script>
-        </th>
-        <th><a href="#" onCLick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&month=%2B%2B')">>></a></th>
-    </tr>
-
-    {foreach from=$SCHEDULER->Month item="_Day"}
-        {if $_Day.isFirst}
-            <tr>
-                <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=week&day={$_Day.day}&month={$_Day.month}')">{$_Day.week}</a></th>
-        {/if}
-                <td>
-
-        {if $_Day.isEmpty}
-                    <div>
-        {elseif $_Day.isToday}
-                    <div style="background-color: grey">
-        {elseif $_Day.isCurrent}
-                    <div style="background-color: lightblue">
-        {else}
-                    <div style="background-color: white">
-        {/if}
-        {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>
-        {/if}
-
-                    </div>
-                 </td>
-        {if $_Day.isLast}
-            </tr>
-        {/if}
-    {/foreach}
-
-</table>
-*}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl
deleted file mode 100755
index 22562bf35..000000000
--- a/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
index 3a88a5aba..2cc0639aa 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
@@ -25,10 +25,12 @@
         {/if}
 
             <td {if $_Day.isToday} class="today"{/if}>
-                <p><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&year={$_Day.year}&month={$_Day.month}&day={$_Day.day}')">{$_Day.day}</a></p>
+                <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&year={$_Day.year}&month={$_Day.month}&day={$_Day.day}')">
+                <p>{$_Day.day}</p>
                 <div class="scala">
                     <div class="scala_in" style="width: {$percentage}px;"></div> <!-- fullsize 96px, multiple of 24 -->
                 </div>
+                </a>
             </td>
 
         {if $_Day.isLast}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
index a9e407631..09e3a08af 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
@@ -14,7 +14,7 @@
         *}
 
         <div class="clearer">&nbsp;</div>
-        <p>{$SCHEDULER->curr.week}. ##KW## {$SCHEDULER->curr.year}</p>
+        <p>{$SCHEDULER->curr.week}. ##calendar week## {$SCHEDULER->curr.year}</p>
 
         <table class="scheduler_week">
             <tr>