diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index df9e7de38..2958243a5 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -560,7 +560,6 @@ class ApiController extends Zend_Controller_Action
             $filepath = str_replace("//", "/", $filepath);
 
             $file = Application_Model_StoredFile::RecallByFilepath($filepath);
-
             if (is_null($file)) {
                 $file = Application_Model_StoredFile::Insert($md);
             }
@@ -573,6 +572,7 @@ class ApiController extends Zend_Controller_Action
                 }else{
                     // file marked as not exists
                     $file->setFileExistsFlag(true);
+                    $file->setMetadata($md);
                 }
             }
         }
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 755cbc7f3..a0429bf17 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -744,6 +744,7 @@ class ScheduleController extends Zend_Controller_Action
         
         $show = new Application_Model_Show($data['add_show_id']);
         $validateStartDate = true;
+        $validateStartTime = true;
         if (!array_key_exists('add_show_start_date', $data)){
             //Changing the start date was disabled, since the
             //array key does not exist. We need to repopulate this entry from the db.
diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php
index 680de4645..36c9d6484 100644
--- a/airtime_mvc/application/forms/AddShowLiveStream.php
+++ b/airtime_mvc/application/forms/AddShowLiveStream.php
@@ -6,7 +6,6 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
 
     public function init()
     {
-        $description1 = "This follows the same security pattern for the shows: only users assigned to the show can connect.";
         $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
         $cb_airtime_auth->setLabel("Use Airtime Authentication:")
                           ->setDescription($description1)
@@ -14,7 +13,6 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
                           ->setDecorators(array('ViewHelper'));
         $this->addElement($cb_airtime_auth);
         
-        $description2 = "Specify custom authentication which will work only for this show.";
         $cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth");
         $cb_custom_auth  ->setLabel("Use Custom Authentication:")
                             ->setDescription($description2)
@@ -74,4 +72,4 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
         }
         return $isValid;
     }
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index 0b7da6155..e05e7a1a5 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -67,19 +67,19 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         
         // Add duration element
         $this->addElement('text', 'add_show_duration', array(
-        	'label'		 => 'Duration:',
+            'label'      => 'Duration:',
             'class'      => 'input_text',
-        	'value'		 => '01h 00m',
-        	'readonly'	 => true,
+            'value'      => '01h 00m',
+            'readonly'   => true,
             'decorators'  => array('ViewHelper')
         ));
 
-		// Add repeats element
-		$this->addElement('checkbox', 'add_show_repeats', array(
+        // Add repeats element
+        $this->addElement('checkbox', 'add_show_repeats', array(
             'label'      => 'Repeats?',
             'required'   => false,
-		    'decorators'  => array('ViewHelper')
-		));
+            'decorators'  => array('ViewHelper')
+        ));
 
     }
 
@@ -92,21 +92,25 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $nowDateTime = new DateTime();
         $showStartDateTime = new DateTime($start_time);
 
-		if ($validateStartDate){
-	        if($showStartDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
-	            $this->getElement('add_show_start_time')->setErrors(array('Cannot create show in the past'));
-	            $valid = false;
-	        }
-	    }
-	    
+        if ($validateStartDate){
+            if($showStartDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
+                $this->getElement('add_show_start_time')->setErrors(array('Cannot create show in the past'));
+                $valid = false;
+            }
+        }
+        
+        $hours = intval(substr($formData["add_show_duration"], 0, strpos($formData["add_show_duration"], 'h')));
+        $minutes = intval(substr($formData["add_show_duration"], -3, -1));
         if( $formData["add_show_duration"] == "00h 00m" ) {
             $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00h 00m'));
             $valid = false;
-        }elseif(strpos($formData["add_show_duration"], 'h') !== false && intval(substr($formData["add_show_duration"], 0, strpos($formData["add_show_duration"], 'h'))) > 24) {
-            $this->getElement('add_show_duration')->setErrors(array('Cannot have duration greater than 24h'));
-            $valid = false;
+        }elseif(strpos($formData["add_show_duration"], 'h') !== false && $hours >= 24) {
+            if ($hours > 24 || ($hours == 24 && $minutes > 0)) {
+                $this->getElement('add_show_duration')->setErrors(array('Cannot have duration greater than 24h'));
+                $valid = false;
+            }
         }elseif( strstr($formData["add_show_duration"], '-') ){
-        	$this->getElement('add_show_duration')->setErrors(array('Cannot have duration < 0m'));
+            $this->getElement('add_show_duration')->setErrors(array('Cannot have duration < 0m'));
             $valid = false;
         }
 
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index b922bc8fe..2933ab554 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -5,6 +5,10 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
     
     public function init()
     {
+        global $CC_CONFIG;
+        $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
+        $isStreamConfigable = Application_Model_Preference::GetEnableStreamConf() == "true";
+        
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
         if($defaultFade == ""){
@@ -32,7 +36,12 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $this->addElement($master_username);
         
         //Master password
-        $master_password = new Zend_Form_Element_Password('master_password');
+        if($isDemo){
+                $master_password = new Zend_Form_Element_Text('master_password');
+        }else{
+                $master_password = new Zend_Form_Element_Password('master_password');
+                $master_password->setAttrib('renderPassword','true');
+        }
         $master_password->setAttrib('autocomplete', 'off')
                         ->setAttrib('renderPassword','true')
                         ->setAllowEmpty(true)
@@ -81,15 +90,29 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($live_dj_mount);
         }
+        // demo only code
+        if(!$isStreamConfigable){
+            $elements = $this->getElements();
+            foreach ($elements as $element)
+            {
+                if ($element->getType() != 'Zend_Form_Element_Hidden')
+                {
+                    $element->setAttrib("disabled", "disabled");
+                }
+            }
+        }
     }
     
     public function updateVariables(){
+        global $CC_CONFIG;
+
         $m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
         $m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
         $l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
         $l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
         $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
-        
+        $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1;
+
         $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
         $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
         
@@ -102,9 +125,9 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         if($l_port=="" || $l_mount==""){
             $live_dj_connection_url = "N/A";
         }
-        
+
         $this->setDecorators(array(
-        array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isSaas' => $isSaas))
+        array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isSaas' => $isSaas, 'isDemo' => $isDemo))
         ));
     }
     
diff --git a/airtime_mvc/application/forms/StreamSetting.php b/airtime_mvc/application/forms/StreamSetting.php
index 0168c8c2a..f8d9e6bb0 100644
--- a/airtime_mvc/application/forms/StreamSetting.php
+++ b/airtime_mvc/application/forms/StreamSetting.php
@@ -37,17 +37,7 @@ class Application_Form_StreamSetting extends Zend_Form
             }
             $this->addElement($output_type);
         }
-
-        # tooltip
-        $description = 'This option enables metadata for OGG streams (stream
-                    metadata is the track title, artist, and show name that is
-                    displayed in an audio player). VLC and mplayer have a
-                    serious bug when playing an OGG/VORBIS stream that has
-                    metadata information enabled: they will disconnect from the
-                    stream after every song. If you are using an OGG stream and
-                    your listeners do not require support for these audio
-                    players, then feel free to enable this option.';
-
+      
         $icecast_vorbis_metadata = new Zend_Form_Element_Checkbox('icecast_vorbis_metadata');
         $icecast_vorbis_metadata->setLabel('Icecast Vorbis Metadata')
                                 ->setDescription($description)
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 57c505713..5486e6aa2 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1782,6 +1782,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i-1]['end_timestamp'],
                                 "starts"=>$rows[$i-1]['starts'],
                                 "ends"=>$rows[$i-1]['ends'],
+                                "record"=>$rows[$i-1]['record'],
                                 "type"=>"show");
                 }
 
@@ -1797,6 +1798,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i+1]['end_timestamp'],
                                 "starts"=>$rows[$i+1]['starts'],
                                 "ends"=>$rows[$i+1]['ends'],
+                                "record"=>$rows[$i+1]['record'],
                                 "type"=>"show");
 
                 }
@@ -1817,6 +1819,7 @@ class Application_Model_Show {
                                 "end_timestamp"=>$rows[$i]['end_timestamp'],
                                 "starts"=>$rows[$i]['starts'],
                                 "ends"=>$rows[$i]['ends'],
+                                "record"=>$rows[$i]['record'],
                                 "type"=>"show");
                 break;
             }
@@ -1832,6 +1835,7 @@ class Application_Model_Show {
                     "end_timestamp"=>$rows[$previousShowIndex]['end_timestamp'],
                     "starts"=>$rows[$previousShowIndex]['starts'],
                     "ends"=>$rows[$previousShowIndex]['ends'],
+                    "record"=>$rows[$previousShowIndex]['record'],
                     "type"=>"show");
         }
         
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index ab911c19c..8d612e721 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -855,7 +855,6 @@ Logging::log("getting media! - 2");
         Logging::log('copyFileToStor: moving file '.$audio_file);
         $md5 = md5_file($audio_file);
         $duplicate = Application_Model_StoredFile::RecallByMd5($md5, true);
-        
 
         $result = null;
         if ($duplicate) {
@@ -886,14 +885,22 @@ Logging::log("getting media! - 2");
                     Logging::log("Warning: couldn't change permissions of $audio_file to 0644");
                 }
                 
-                //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation
-                $r = @rename($audio_file, $audio_stor);
+                // Check if file is playable
+                $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1", $audio_file);
+                exec($command, $output, $rv);
+                if ($rv != 0) {
+                    $result = array("code" => 110, "message" => "This file appears to be corrupted and could not be uploaded.");
+                }
+                else {
+                    //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation
+                    $r = @rename($audio_file, $audio_stor);
 
-                if ($r === false) {
-                   #something went wrong likely there wasn't enough space in the audio_stor to move the file too.
-                   #warn the user that the file wasn't uploaded and they should check if there is enough disk space.
-                    unlink($audio_file);//remove the file from the organize after failed rename
-                    $result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space.");
+                    if ($r === false) {
+                        #something went wrong likely there wasn't enough space in the audio_stor to move the file too.
+                        #warn the user that the file wasn't uploaded and they should check if there is enough disk space.
+                        unlink($audio_file);//remove the file from the organize after failed rename
+                        $result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space.");
+                    }
                 }
             }
         }
diff --git a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
index 6028cf399..86272f3ce 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
@@ -3,11 +3,7 @@
         <dt id="cb_airtime_auth_override-label">
             <label class="optional" for="cb_airtime_auth">
             <?php echo $this->element->getElement('cb_airtime_auth')->getLabel() ?>
-            <span class='info-tooltip'>
-                        <span>
-                            <?php echo $this->element->getElement('cb_airtime_auth')->getDescription() ?>
-                        </span>
-                    </span>
+            <span class='airtime_auth_help_icon'></span>
             </label>
         </dt>
         <dd id="cb_airtime_auth_override-element">
@@ -16,11 +12,7 @@
         <dt id="cb_custom_auth_override-label">
             <label class="optional" for="cb_custom_auth">
             <?php echo $this->element->getElement('cb_custom_auth')->getLabel() ?>
-            <span class='info-tooltip'>
-                        <span>
-                            <?php echo $this->element->getElement('cb_custom_auth')->getDescription() ?>
-                        </span>
-                    </span>
+            <span class='custom_auth_help_icon'></span>
             </label>
         </dt>
         <dd id="cb_custom_auth_override-element">
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 428af66fd..8449c9e2b 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -79,7 +79,7 @@
         </dt>
         <dd id="master_dj_connection_url-element">
             <span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span>
-            <?php if( !$this->isSaas ){?>
+            <?php if( !$this->isSaas && !$this->isDemo){?>
                 <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
@@ -122,7 +122,7 @@
         </dt>
         <dd id="live_dj_connection_url-element">
             <span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span>
-            <?php if( !$this->isSaas ){?>   
+            <?php if( !$this->isSaas && !$this->isDemo ){?>   
                 <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index 8faeb5913..ba204baca 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -3,8 +3,12 @@
     		<fieldset>
 		    <dl class="zend_form">
 		    	<dt class="block-display info-text">
-            		Help Airtime improve by letting us know you are using it. This info
-            			will be collected regularly in order to improve your user experience.
+            		Help Airtime improve by letting us know how you are using it. This info
+            		will be collected regularly in order to improve your user experience.
+            		<br /><br />
+            		In additon to that, this is how you vote for existing features. We actively remove
+            		features that are not used, so be sure to click "Yes, help Airtime" to keep
+            		your favourite features around.
                 </dt>
 		    	<dd id="SupportFeedback-element" class="block-display">
 		            <label class="optional" for="SupportFeedback">
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index ac3afbf7f..e32d42136 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -2,8 +2,13 @@
 <?php if( !$this->isSaas ){?>
     <dl class="zend_form">
         <dd id="SupportFeedback-element" style="width:90%;">
-            <div class="info-text">Help Airtime improve by letting us know you are using it. This info
-            will be collected regularly in order to improve your user experience.</div>
+            <div class="info-text">
+                Help Airtime improve by letting us know how you are using it. This info
+                will be collected regularly in order to improve your user experience.<br /><br />
+                In additon to that, this is how you vote for existing features. We actively remove
+                features that are not used, so be sure to click "Yes, help Airtime" to keep
+                your favourite features around.
+            </div>
             <label class="optional" for="SupportFeedback">
                 <?php echo $this->element->getElement('SupportFeedback') ?>
                 <strong><?php echo $this->element->getElement('SupportFeedback')->getLabel() ?></strong>
diff --git a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
index 5577d3a65..d5da4327e 100644
--- a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
@@ -4,5 +4,6 @@
   
   <div id="login" class="login-content clearfix">
     <p class="light">An email has been sent</p>
+    <p><a class="link" href="<?php echo $this->baseUrl('login'); ?>">Back to login screen</a></p>
   </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index 156c3d342..5e9d94333 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -33,10 +33,7 @@
             <dt id="vorbisMetadata-label">
                 <label class="required">
                     <?php echo $this->form->getElement('icecast_vorbis_metadata')->getLabel() ?> :
-                    <span class='info-tooltip'>
-                        <span>
-                            <?php echo $this->form->getElement('icecast_vorbis_metadata')->getDescription() ?>
-                        </span>
+                    <span class='icecast_metadata_help_icon'>
                     </span>
                 </label>
             </dt>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index ed31730be..4c2f735a2 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -93,7 +93,7 @@ select {
 }
 /* Version Notification Ends*/
 
-.override_help_icon {
+.override_help_icon, .icecast_metadata_help_icon  {
         cursor: help;
         position: relative;
         
@@ -104,8 +104,7 @@ select {
         line-height:16px !important;
 }
 
-/* Info Tooltip Starts */
-.info-tooltip {
+.airtime_auth_help_icon, .custom_auth_help_icon {
         cursor: help;
         position: relative;
         display:inline-block; zoom:1;
@@ -114,28 +113,6 @@ select {
         top:2px; right:7px; left: 3px;
         line-height:16px !important;
 }
-.info-tooltip span {
-        margin-left: -9999em;
-        position: absolute;
-        padding: 1em 1em 1em 1em;
-        text-indent:0; font-family:Arial, Helvetica, sans-serif !important; font-size:13px !important;
-        border:#505050 solid 3px;
-        background:#e6e6e6;
-        cursor:text;
-}
-.info-tooltip:hover span:before {
-        content:"";
-        position:absolute; top:22px; left:-11px;
-        width:8px; height:15px;
-        margin:-7px 0 0 0;
-        background:url(/css/images/tooltip_arrow.png) 0 0 no-repeat;
-}
-.info-tooltip:hover span {
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1);
-        position: absolute; left: 25px; top: -18px; z-index: 99;
-        margin-left: 0; width: 200px;
-}
-/* Info Tooltip Ends */
 
 /* Clearfix */
 .clearfix:after, #side_playlist li:after { content: "."; display: block;	height: 0; clear: both;  visibility: hidden;}
@@ -2401,6 +2378,7 @@ tfoot tr th	{
 	color:red;
 	border:1px solid #c83f3f;
 	background:#c6b4b4;
+	display:none;
 }
 #plupload_error table td {
 	color:#902d2d;
diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 4f2293514..98a167238 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -83,7 +83,7 @@ function updateProgressBarValue(){
             songPercentDone = 0;        
             currentSong = null;
         } else {
-            if ((currentSong.media_item_played == true && currentShow.length > 0) || songElapsedTime < 5000) {
+            if ((currentSong.media_item_played == true && currentShow.length > 0) || (songElapsedTime < 5000 && currentShow[0].record != 1)) {
                 scheduled_play_line_to_switch.attr("class", "line-to-switch on");
                 scheduled_play_div.addClass("ready");
                 scheduled_play_source = true;
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index c5e1b7495..e453b02a7 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -5,7 +5,8 @@ var AIRTIME = (function(AIRTIME) {
 	    $libContent,
 	    $libTable,
 	    LIB_SELECTED_CLASS = "lib-selected",
-	    chosenItems = {};
+	    chosenItems = {},
+	    visibleChosenItems = {};
     
     if (AIRTIME.library === undefined) {
         AIRTIME.library = {};
@@ -13,16 +14,45 @@ var AIRTIME = (function(AIRTIME) {
     mod = AIRTIME.library;
     
     mod.getChosenItemsLength = function(){
-    	var selected = Object.keys(chosenItems).length;
-    	
+        var cItem,
+            selected,
+            $trs;
+		    
+        // Get visible items and check if any chosenItems are visible
+        $trs = $libTable.find("tbody input:checkbox").parents("tr");
+        $trs.each(function(i){
+            for (cItem in chosenItems) {
+                if (cItem === $(this).attr("id")) {
+                    visibleChosenItems[cItem] = $(this).data('aData');
+                }
+            } 
+        });
+	    
+    	selected = Object.keys(visibleChosenItems).length;
+    	visibleChosenItems = {};
     	return selected;
     };
     
     mod.getChosenAudioFilesLength = function(){
-    	var files = Object.keys(chosenItems),
-    		i, length,
-    		count = 0,
-    		reAudio=/^au/ ;
+    	//var files = Object.keys(chosenItems),
+    	var files,
+            $trs,
+            cItem,
+            i, length,
+            count = 0,
+            reAudio=/^au/ ;
+    		
+        // Get visible items and check if any chosenItems are visible
+        $trs = $libTable.find("tbody input:checkbox").parents("tr");
+        $trs.each(function(i){
+            for (cItem in chosenItems) {
+                if (cItem === $(this).attr("id")) {
+                    visibleChosenItems[cItem] = $(this).data('aData');
+                }
+            } 
+        });
+        
+        files = Object.keys(visibleChosenItems);
     	
     	for (i = 0, length = files.length; i < length; i++) {
     		
@@ -72,14 +102,27 @@ var AIRTIME = (function(AIRTIME) {
     
     mod.getSelectedData = function() {
     	var id,
-    		data = [];
+            data = [],
+            cItem,
+            $trs;
+            
+    	$.fn.reverse = [].reverse;
     	
-    	for (id in chosenItems) {
-    		
-    		if (chosenItems.hasOwnProperty(id)) {
-    			data.push(chosenItems[id]);
-    		}
-    	}
+    	// Get visible items and check if any chosenItems are visible
+        $trs = $libTable.find("tbody input:checkbox").parents("tr").reverse();
+    	$trs.each(function(i){
+            for (cItem in chosenItems) {
+                if (cItem === $(this).attr("id")) {
+                    visibleChosenItems[cItem] = $(this).data('aData');
+                }
+            } 
+        });
+    	
+    	for (id in visibleChosenItems) {
+            if (visibleChosenItems.hasOwnProperty(id)) {
+                data.push(visibleChosenItems[id]);
+            }
+        }
     	
     	return data;
     };
@@ -153,10 +196,14 @@ var AIRTIME = (function(AIRTIME) {
     /*
      * selects all items which the user can currently see.
      * (behaviour taken from gmail)
+     * 
+     * by default the items are selected in reverse order
+     * so we need to reverse it back
      */
     mod.selectCurrentPage = function() {
-    	var $trs = $libTable.find("tbody input:checkbox").parents("tr");
-    	
+        $.fn.reverse = [].reverse;
+    	var $trs = $libTable.find("tbody input:checkbox").parents("tr").reverse();
+
     	$trs.each(function(i, el){
     		$el = $(this);
     		
@@ -656,7 +703,7 @@ function checkImportStatus() {
         }
         else{
             if ($(div).is(':visible')) {
-                table.fnDraw();
+                table.fnStandingRedraw();
             }
             div.hide();
         }
diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js
index 68ef61c62..ab222b6b6 100644
--- a/airtime_mvc/public/js/airtime/library/plupload.js
+++ b/airtime_mvc/public/js/airtime/library/plupload.js
@@ -24,6 +24,7 @@ $(document).ready(function() {
 				.append('<td>' + j.error.message + '</td>');
 				
 			$("#plupload_error").find("table").append(row);
+			$("#plupload_error table").css("display", "inline-table");
 		}else{
 		    var tempFileName = j.tempfilepath;
 		    $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name)+'/tempname/'+encodeURIComponent(tempFileName), function(json){
@@ -34,6 +35,7 @@ $(document).ready(function() {
 		                .append('<td>' + jr.error.message + '</td>');
 		                
 		            $("#plupload_error").find("table").append(row);
+		            $("#plupload_error table").css("display", "inline-table");
 		        }
 		    });
 		}
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 001866f8d..cdede0d38 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -257,4 +257,25 @@ $(document).ready(function() {
             at: "right center"
         },
     })
+    
+    $(".icecast_metadata_help_icon").qtip({
+        content: {
+            text: "This option enables metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        },
+    })
 });
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index f14297e7b..017640903 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -179,7 +179,48 @@ function setAddShowEvents() {
     form.find("#add_show_day_check-element").addClass("block-display clearfix");
     form.find("#add_show_day_check-element label").addClass("wrapp-label");
     form.find("#add_show_day_check-element br").remove();
-
+    
+    form.find(".airtime_auth_help_icon").qtip({
+        content: {
+            text: "This follows the same security pattern for the shows: only users assigned to the show can connect."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        }
+    });
+    form.find(".custom_auth_help_icon").qtip({
+        content: {
+            text: "Specify custom authentication which will work only for this show."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        }
+    });
+    
     function endDateVisibility(){
         if(form.find("#add_show_no_end").is(':checked')){
             form.find("#add_show_end_date").hide();
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index a34814822..b43438307 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -1,195 +1,195 @@
 var AIRTIME = (function(AIRTIME){
-	var mod,
-		oSchedTable,
-		SB_SELECTED_CLASS = "sb-selected",
-		CURSOR_SELECTED_CLASS = "cursor-selected-row",
-		NOW_PLAYING_CLASS = "sb-now-playing",
-		$sbContent,
-		$sbTable,
-		$toolbar,
-		$ul,
-		$lib;
-	
-	if (AIRTIME.showbuilder === undefined) {
-		AIRTIME.showbuilder = {};
-	}
-	mod = AIRTIME.showbuilder;
-	
-	function checkError(json) {
-		if (json.error !== undefined) {
-			alert(json.error);
-		}
-	}
-	
-	mod.timeout = undefined;
-	mod.timestamp = -1;
-	mod.showInstances = [];
-	
-	mod.resetTimestamp = function() {
-		
-		mod.timestamp = -1;
-	};
-	
-	mod.setTimestamp = function(timestamp) {
-		
-		mod.timestamp = timestamp;
-	};
-	
-	mod.getTimestamp = function() {
-		
-		if (mod.timestamp !== undefined) {
-			return mod.timestamp;
-		}
-		else {
-			return -1;
-		}
-	};
-	
-	mod.setShowInstances = function(showInstances) {
-		mod.showInstances = showInstances;
-	};
-	
-	mod.getShowInstances = function() {
-		return mod.showInstances;
-	};
-	
-	mod.refresh = function() {
-		mod.resetTimestamp();
-		oSchedTable.fnDraw();
-	};
-	
-	mod.checkSelectButton = function() {
-		var $selectable = $sbTable.find("tbody").find("input:checkbox");
-		
-		if ($selectable.length !== 0) {
-			AIRTIME.button.enableButton("sb-button-select");
-		}
-		else {
-			AIRTIME.button.disableButton("sb-button-select");
-		}
-	};
-	
-	mod.checkTrimButton = function() {
-		var $over = $sbTable.find(".sb-over.sb-allowed");
-		
-		if ($over.length !== 0) {
-			AIRTIME.button.enableButton("sb-button-trim");
-		}
-		else {
-			AIRTIME.button.disableButton("sb-button-trim");
-		}
-	};
-	
-	mod.checkDeleteButton = function() {
-		var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
-		
-		if ($selected.length !== 0) {
-			AIRTIME.button.enableButton("sb-button-delete");
-		}
-		else {
-			AIRTIME.button.disableButton("sb-button-delete");
-		}
-	};
-	
-	mod.checkJumpToCurrentButton = function() {
-		var $current = $sbTable.find("."+NOW_PLAYING_CLASS);
-		
-		if ($current.length !== 0) {
-			AIRTIME.button.enableButton("sb-button-current");
-		}
-		else {
-			AIRTIME.button.disableButton("sb-button-current");
-		}
-	};
-	
-	mod.checkCancelButton = function() {
-		var $current = $sbTable.find(".sb-current-show.sb-allowed"),
-			//this user type should be refactored into a separate users module later
-			//when there's more time and more JS will need to know user data.
-			userType = localStorage.getItem('user-type');
-		
-		if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
-			AIRTIME.button.enableButton("sb-button-cancel");
-		}
-		else {
-			AIRTIME.button.disableButton("sb-button-cancel");
-		}
-	};
-	
-	mod.checkToolBarIcons = function() {
-    	
-		AIRTIME.library.checkAddButton();
-		mod.checkSelectButton();
-		mod.checkTrimButton();
-		mod.checkDeleteButton();
-		mod.checkJumpToCurrentButton();
-		mod.checkCancelButton();
+    var mod,
+        oSchedTable,
+        SB_SELECTED_CLASS = "sb-selected",
+        CURSOR_SELECTED_CLASS = "cursor-selected-row",
+        NOW_PLAYING_CLASS = "sb-now-playing",
+        $sbContent,
+        $sbTable,
+        $toolbar,
+        $ul,
+        $lib;
+    
+    if (AIRTIME.showbuilder === undefined) {
+        AIRTIME.showbuilder = {};
+    }
+    mod = AIRTIME.showbuilder;
+    
+    function checkError(json) {
+        if (json.error !== undefined) {
+            alert(json.error);
+        }
+    }
+    
+    mod.timeout = undefined;
+    mod.timestamp = -1;
+    mod.showInstances = [];
+    
+    mod.resetTimestamp = function() {
+        
+        mod.timestamp = -1;
+    };
+    
+    mod.setTimestamp = function(timestamp) {
+        
+        mod.timestamp = timestamp;
+    };
+    
+    mod.getTimestamp = function() {
+        
+        if (mod.timestamp !== undefined) {
+            return mod.timestamp;
+        }
+        else {
+            return -1;
+        }
+    };
+    
+    mod.setShowInstances = function(showInstances) {
+        mod.showInstances = showInstances;
+    };
+    
+    mod.getShowInstances = function() {
+        return mod.showInstances;
+    };
+    
+    mod.refresh = function() {
+        mod.resetTimestamp();
+        oSchedTable.fnDraw();
+    };
+    
+    mod.checkSelectButton = function() {
+        var $selectable = $sbTable.find("tbody").find("input:checkbox");
+        
+        if ($selectable.length !== 0) {
+            AIRTIME.button.enableButton("sb-button-select");
+        }
+        else {
+            AIRTIME.button.disableButton("sb-button-select");
+        }
+    };
+    
+    mod.checkTrimButton = function() {
+        var $over = $sbTable.find(".sb-over.sb-allowed");
+        
+        if ($over.length !== 0) {
+            AIRTIME.button.enableButton("sb-button-trim");
+        }
+        else {
+            AIRTIME.button.disableButton("sb-button-trim");
+        }
+    };
+    
+    mod.checkDeleteButton = function() {
+        var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
+        
+        if ($selected.length !== 0) {
+            AIRTIME.button.enableButton("sb-button-delete");
+        }
+        else {
+            AIRTIME.button.disableButton("sb-button-delete");
+        }
+    };
+    
+    mod.checkJumpToCurrentButton = function() {
+        var $current = $sbTable.find("."+NOW_PLAYING_CLASS);
+        
+        if ($current.length !== 0) {
+            AIRTIME.button.enableButton("sb-button-current");
+        }
+        else {
+            AIRTIME.button.disableButton("sb-button-current");
+        }
+    };
+    
+    mod.checkCancelButton = function() {
+        var $current = $sbTable.find(".sb-current-show.sb-allowed"),
+            //this user type should be refactored into a separate users module later
+            //when there's more time and more JS will need to know user data.
+            userType = localStorage.getItem('user-type');
+        
+        if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
+            AIRTIME.button.enableButton("sb-button-cancel");
+        }
+        else {
+            AIRTIME.button.disableButton("sb-button-cancel");
+        }
+    };
+    
+    mod.checkToolBarIcons = function() {
+        
+        AIRTIME.library.checkAddButton();
+        mod.checkSelectButton();
+        mod.checkTrimButton();
+        mod.checkDeleteButton();
+        mod.checkJumpToCurrentButton();
+        mod.checkCancelButton();
     };
     
     mod.selectCursor = function($el) {
-    	
-    	$el.addClass(CURSOR_SELECTED_CLASS);
-    	mod.checkToolBarIcons();
+        
+        $el.addClass(CURSOR_SELECTED_CLASS);
+        mod.checkToolBarIcons();
     };
     
     mod.removeCursor = function($el) {
-    	
-    	$el.removeClass(CURSOR_SELECTED_CLASS);
-    	mod.checkToolBarIcons();
+        
+        $el.removeClass(CURSOR_SELECTED_CLASS);
+        mod.checkToolBarIcons();
     };
-	
+    
     /*
      * sNot is an optional string to filter selected elements by. (ex removing the currently playing item)
      */
-	mod.getSelectedData = function(sNot) {
-    	var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked").parents("tr"),
-    		aData = [],
-    		i, length,
-    		$item;
-    	
-    	if (sNot !== undefined) {
-    		$selected = $selected.not("."+sNot);
-    	}
-    	
-    	for (i = 0, length = $selected.length; i < length; i++) {
-    		$item = $($selected.get(i));
-    		aData.push($item.data('aData'));
-    	}
-    	
-    	return aData.reverse();
+    mod.getSelectedData = function(sNot) {
+        var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked").parents("tr"),
+            aData = [],
+            i, length,
+            $item;
+        
+        if (sNot !== undefined) {
+            $selected = $selected.not("."+sNot);
+        }
+        
+        for (i = 0, length = $selected.length; i < length; i++) {
+            $item = $($selected.get(i));
+            aData.push($item.data('aData'));
+        }
+        
+        return aData.reverse();
     };
     
     mod.selectAll = function () {
-    	$inputs = $sbTable.find("input:checkbox");
-    	
-    	$inputs.attr("checked", true);
-    	
-    	$trs = $inputs.parents("tr");
- 		$trs.addClass(SB_SELECTED_CLASS);
- 		
- 		mod.checkToolBarIcons();
+        $inputs = $sbTable.find("input:checkbox");
+        
+        $inputs.attr("checked", true);
+        
+        $trs = $inputs.parents("tr");
+        $trs.addClass(SB_SELECTED_CLASS);
+        
+        mod.checkToolBarIcons();
     };
     
     mod.selectNone = function () {
-    	$inputs = $sbTable.find("input:checkbox");
-    	
-    	$inputs.attr("checked", false);
-    	
-    	$trs = $inputs.parents("tr");
- 		$trs.removeClass(SB_SELECTED_CLASS);
- 		
- 		mod.checkToolBarIcons();
+        $inputs = $sbTable.find("input:checkbox");
+        
+        $inputs.attr("checked", false);
+        
+        $trs = $inputs.parents("tr");
+        $trs.removeClass(SB_SELECTED_CLASS);
+        
+        mod.checkToolBarIcons();
     };
     
     mod.disableUI = function() {
-    	
-    	$lib.block({ 
+        
+        $lib.block({ 
             message: "",
             theme: true,
             applyPlatformOpacityRules: false
         });
-    	
-    	$sbContent.block({ 
+        
+        $sbContent.block({ 
             message: "",
             theme: true,
             applyPlatformOpacityRules: false
@@ -197,385 +197,395 @@ var AIRTIME = (function(AIRTIME){
     };
     
     mod.enableUI = function() {
-    	
-    	$lib.unblock();
-    	$sbContent.unblock();
-    	
-    	//Block UI changes the postion to relative to display the messages.
-    	$lib.css("position", "static");
-    	$sbContent.css("position", "static");
+        
+        $lib.unblock();
+        $sbContent.unblock();
+        
+        //Block UI changes the postion to relative to display the messages.
+        $lib.css("position", "static");
+        $sbContent.css("position", "static");
     };
     
     mod.fnItemCallback = function(json) {
-    	checkError(json);
-		oSchedTable.fnDraw();
-		
-		mod.enableUI();
+        checkError(json);
+        oSchedTable.fnDraw();
+        
+        mod.enableUI();
     };
-	
-	mod.fnAdd = function(aMediaIds, aSchedIds) {
-		
-		mod.disableUI();
-		
-		$.post("/showbuilder/schedule-add", 
-			{"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds}, 
-			mod.fnItemCallback
-		);
-	};
-	
-	mod.fnMove = function(aSelect, aAfter) {
-		
-		mod.disableUI();
-		
-		$.post("/showbuilder/schedule-move", 
-			{"format": "json", "selectedItem": aSelect, "afterItem": aAfter},  
-			mod.fnItemCallback
-		);
-	};
-	
-	mod.fnRemove = function(aItems) {
-		
-		mod.disableUI();
-		
-		$.post( "/showbuilder/schedule-remove",
-			{"items": aItems, "format": "json"},
-			mod.fnItemCallback
-		);
-	};
-	
-	mod.fnRemoveSelectedItems = function() {
-		var aData = mod.getSelectedData(),
-			i,
-			length,
-			temp,
-			aItems = [];
+    
+    mod.fnAdd = function(aMediaIds, aSchedIds) {
+        
+        mod.disableUI();
+        
+        $.post("/showbuilder/schedule-add", 
+            {"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds}, 
+            mod.fnItemCallback
+        );
+    };
+    
+    mod.fnMove = function(aSelect, aAfter) {
+        
+        mod.disableUI();
+        
+        $.post("/showbuilder/schedule-move", 
+            {"format": "json", "selectedItem": aSelect, "afterItem": aAfter},  
+            mod.fnItemCallback
+        );
+    };
+    
+    mod.fnRemove = function(aItems) {
+        
+        mod.disableUI();
+        
+        $.post( "/showbuilder/schedule-remove",
+            {"items": aItems, "format": "json"},
+            mod.fnItemCallback
+        );
+    };
+    
+    mod.fnRemoveSelectedItems = function() {
+        var aData = mod.getSelectedData(),
+            i,
+            length,
+            temp,
+            aItems = [];
 
-		for (i=0, length = aData.length; i < length; i++) {
-			temp = aData[i];
-			aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); 	
-		}
-		
-		mod.fnRemove(aItems);
-	};
-	
-	mod.fnServerData = function fnBuilderServerData( sSource, aoData, fnCallback ) {
-		
-		aoData.push( { name: "timestamp", value: mod.getTimestamp()} );
-		aoData.push( { name: "instances", value: mod.getShowInstances()} );
-		aoData.push( { name: "format", value: "json"} );
-		
-		if (mod.fnServerData.hasOwnProperty("start")) {
-			aoData.push( { name: "start", value: mod.fnServerData.start} );
-		}
-		if (mod.fnServerData.hasOwnProperty("end")) {
-			aoData.push( { name: "end", value: mod.fnServerData.end} );
-		}
-		if (mod.fnServerData.hasOwnProperty("ops")) {
-			aoData.push( { name: "myShows", value: mod.fnServerData.ops.myShows} );
-			aoData.push( { name: "showFilter", value: mod.fnServerData.ops.showFilter} );
-		}
-		
-		$.ajax({
-			"dataType": "json",
-			"type": "POST",
-			"url": sSource,
-			"data": aoData,
-			"success": function(json) {
-				mod.setTimestamp(json.timestamp);
-				mod.setShowInstances(json.instances);
-				fnCallback(json);
-			}
-		});
-	};
-	
-	mod.builderDataTable = function() {
-		$sbContent = $('#show_builder');
-		$lib = $("#library_content"),
-		$sbTable = $sbContent.find('table');
-		
-		/*
+        for (i=0, length = aData.length; i < length; i++) {
+            temp = aData[i];
+            aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp});   
+        }
+        
+        mod.fnRemove(aItems);
+    };
+    
+    mod.fnServerData = function fnBuilderServerData( sSource, aoData, fnCallback ) {
+        
+        aoData.push( { name: "timestamp", value: mod.getTimestamp()} );
+        aoData.push( { name: "instances", value: mod.getShowInstances()} );
+        aoData.push( { name: "format", value: "json"} );
+        
+        if (mod.fnServerData.hasOwnProperty("start")) {
+            aoData.push( { name: "start", value: mod.fnServerData.start} );
+        }
+        if (mod.fnServerData.hasOwnProperty("end")) {
+            aoData.push( { name: "end", value: mod.fnServerData.end} );
+        }
+        if (mod.fnServerData.hasOwnProperty("ops")) {
+            aoData.push( { name: "myShows", value: mod.fnServerData.ops.myShows} );
+            aoData.push( { name: "showFilter", value: mod.fnServerData.ops.showFilter} );
+        }
+        
+        $.ajax({
+            "dataType": "json",
+            "type": "POST",
+            "url": sSource,
+            "data": aoData,
+            "success": function(json) {
+                mod.setTimestamp(json.timestamp);
+                mod.setShowInstances(json.instances);
+                fnCallback(json);
+            }
+        });
+    };
+    
+    mod.builderDataTable = function() {
+        $sbContent = $('#show_builder');
+        $lib = $("#library_content"),
+        $sbTable = $sbContent.find('table');
+        
+        /*
          * Icon hover states in the toolbar.
          */
-		$sbContent.on("mouseenter", ".fg-toolbar ul li", function(ev) {
-        	$el = $(this);
-        	
-        	if (!$el.hasClass("ui-state-disabled")) {
-        		$el.addClass("ui-state-hover");
-        	}     	
+        $sbContent.on("mouseenter", ".fg-toolbar ul li", function(ev) {
+            $el = $(this);
+            
+            if (!$el.hasClass("ui-state-disabled")) {
+                $el.addClass("ui-state-hover");
+            }       
         });
-		$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
-        	$el = $(this);
-        	
-        	if (!$el.hasClass("ui-state-disabled")) {
-        		$el.removeClass("ui-state-hover");
-        	} 
+        $sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
+            $el = $(this);
+            
+            if (!$el.hasClass("ui-state-disabled")) {
+                $el.removeClass("ui-state-hover");
+            } 
         });
-		
-		oSchedTable = $sbTable.dataTable( {
-			"aoColumns": [
-		    /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
+        
+        oSchedTable = $sbTable.dataTable( {
+            "aoColumns": [
+            /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
             /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "16px"},
-	        /* starts */ {"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts", "sWidth": "60px"},
-	        /* ends */ {"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends", "sWidth": "60px"},
-	        /* runtime */ {"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length", "sWidth": "65px"},
-	        /* title */ {"mDataProp": "title", "sTitle": "Title", "sClass": "sb-title"},
-	        /* creator */ {"mDataProp": "creator", "sTitle": "Creator", "sClass": "sb-creator"},
-	        /* album */ {"mDataProp": "album", "sTitle": "Album", "sClass": "sb-album"},
-	        /* cue in */ {"mDataProp": "cuein", "sTitle": "Cue In", "bVisible": false, "sClass": "sb-cue-in"},
-	        /* cue out */ {"mDataProp": "cueout", "sTitle": "Cue Out", "bVisible": false, "sClass": "sb-cue-out"},
-	        /* fade in */ {"mDataProp": "fadein", "sTitle": "Fade In", "bVisible": false, "sClass": "sb-fade-in"},
-	        /* fade out */ {"mDataProp": "fadeout", "sTitle": "Fade Out", "bVisible": false, "sClass": "sb-fade-out"}
-	        ],
-	        
-	        "bJQueryUI": true,
-	        "bSort": false,
-	        "bFilter": false,
-	        "bProcessing": true,
-			"bServerSide": true,
-			"bInfo": false,
-			"bAutoWidth": false,
-			
-			"bStateSave": true,
-			"fnStateSaveParams": function (oSettings, oData) {
-	    		//remove oData components we don't want to save.
-	    		delete oData.oSearch;
-	    		delete oData.aoSearchCols;
-		    },
-	        "fnStateSave": function fnStateSave(oSettings, oData) {
-	           
-	        	localStorage.setItem('datatables-timeline', JSON.stringify(oData));
-	        	
-	    		$.ajax({
-				  url: "/usersettings/set-timeline-datatable",
-				  type: "POST",
-				  data: {settings : oData, format: "json"},
-				  dataType: "json"
-				});
-	        },
-	        "fnStateLoad": function fnBuilderStateLoad(oSettings) {
-	        	var settings = localStorage.getItem('datatables-timeline');
-            	
-            	if (settings !== "") {
-            		return JSON.parse(settings);
-            	} 	
-	        },
-	        "fnStateLoadParams": function (oSettings, oData) {
-	        	var i,
-					length,
-					a = oData.abVisCols;
-			
-	        	//putting serialized data back into the correct js type to make
-	        	//sure everything works properly.
-		        for (i = 0, length = a.length; i < length; i++) {	
-		        	if (typeof(a[i]) === "string") {
-                		a[i] = (a[i] === "true") ? true : false;
-                	}
-		        }
-		        
-		        a = oData.ColReorder;
-		        for (i = 0, length = a.length; i < length; i++) {	
-		        	if (typeof(a[i]) === "string") {
-                		a[i] = parseInt(a[i], 10);
-                	}
-		        }
-		       
-		        oData.iCreate = parseInt(oData.iCreate, 10);
-	        },
-	        
-			"fnServerData": mod.fnServerData,
-			"fnRowCallback": function fnRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
-				var i, length,
-					sSeparatorHTML,
-					fnPrepareSeparatorRow,
-					$node,
-					cl="",
-					//background-color to imitate calendar color.
-					r,g,b,a,
-					$nRow = $(nRow),
-					$image,
-					$div,
-					headerIcon;
-				
-				fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
-					
-					$node = $(nRow.children[iNodeIndex]);
-					$node.html(sRowContent);
-					$node.attr('colspan',100);
-					for (i = iNodeIndex + 1, length = nRow.children.length; i < length; i = i+1) {
-						$node = $(nRow.children[i]);
-						$node.html("");
-						$node.attr("style", "display : none");
-					}
-					
-					$nRow.addClass(sClass);
-				};
-				         
-				if (aData.header === true) {
-					//remove the column classes from all tds.
-					$nRow.find('td').removeClass();
-					
-					$node = $(nRow.children[0]);
-					$node.html("");
-					cl = 'sb-header';
-					
-					if (aData.record === true) {
-						
-						headerIcon =  (aData.soundcloud_id > 0) ? "soundcloud" : "recording";
-						
-						$div = $("<div/>", {
-							"class": "small-icon " + headerIcon
-						});
-						$node.append($div);
-					}
-					else if (aData.rebroadcast === true) {
-						$div = $("<div/>", {
-							"class": "small-icon rebroadcast"
-						});
-						$node.append($div);
-					}
-					
-					sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>';
-					
-					if (aData.rebroadcast === true) {
-						sSeparatorHTML += '<span>'+aData.rebroadcast_title+'</span>';
-					}
-					
-					sSeparatorHTML += '<span class="push-right">';
-					
-					if (aData.startDate === aData.endDate) {
-						sSeparatorHTML += '<span class="show-date">'+aData.startDate+'</span><span class="show-time">'+aData.startTime+'</span>';
-						sSeparatorHTML +='-<span class="show-time">'+aData.endTime+'</span>';
-					}
-					else {
-						sSeparatorHTML += '<span class="show-date">'+aData.startDate+'</span><span class="show-time">'+aData.startTime+'</span>';
-						sSeparatorHTML +='-<span class="show-date">'+aData.endDate+'</span><span class="show-time">'+aData.endTime+'</span>';
-					}
-					
-					sSeparatorHTML += '</span>';
-					
-					fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
-				}
-				else if (aData.footer === true) {
-					//remove the column classes from all tds.
-					$nRow.find('td').removeClass();
-					
-					$node = $(nRow.children[0]);
-					cl = 'sb-footer';
-					
-					//check the show's content status.
-					if (aData.runtime > 0) {
-						$node.html('<span class="ui-icon ui-icon-check"></span>');
-						cl = cl + ' ui-state-highlight';
-					}
-					else {
-						$node.html('<span class="ui-icon ui-icon-notice"></span>');
-						cl = cl + ' ui-state-error';
-					}
-						
-					sSeparatorHTML = '<span>'+aData.fRuntime+'</span>';
-					fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
-				}
-				else if (aData.empty === true) {
-					//remove the column classes from all tds.
-					$nRow.find('td').removeClass();
-					
-					$node = $(nRow.children[0]);
-					$node.html('');
-					
-					sSeparatorHTML = '<span>Show Empty</span>';
-					cl = cl + " sb-empty odd";
-					
-					fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
-				}
-				else if (aData.record === true) {
-					//remove the column classes from all tds.
-					$nRow.find('td').removeClass();
-					
-					$node = $(nRow.children[0]);
-					$node.html('');
-					
-					sSeparatorHTML = '<span>Recording From Line In</span>';
-					cl = cl + " sb-record odd";
-					
-					fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
-				}
-				else {
-					
-					 //add the play function if the file exists on disk.
-					$image = $nRow.find('td.sb-image');
-					//check if the file exists.
-					if (aData.image === true) {
-						$image.html('<img title="Track preview" src="/css/images/icon_audioclip.png"></img>')
-							.click(function() {
-			                    open_show_preview(aData.instance, aData.pos);
-			                    return false;
-			                });
-					}
-					else {
-						$image.html('<span class="ui-icon ui-icon-alert"></span>');
-					}
-					
-					$node = $(nRow.children[0]);
-					if (aData.allowed === true && aData.scheduled >= 1) {
-						$node.html('<input type="checkbox" name="'+aData.id+'"></input>');
-					}
-					else {
-						$node.html('');
-					}
-				}
-				
-				//add the show colour to the leftmost td
+            /* starts */ {"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts", "sWidth": "60px"},
+            /* ends */ {"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends", "sWidth": "60px"},
+            /* runtime */ {"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length", "sWidth": "65px"},
+            /* title */ {"mDataProp": "title", "sTitle": "Title", "sClass": "sb-title"},
+            /* creator */ {"mDataProp": "creator", "sTitle": "Creator", "sClass": "sb-creator"},
+            /* album */ {"mDataProp": "album", "sTitle": "Album", "sClass": "sb-album"},
+            /* cue in */ {"mDataProp": "cuein", "sTitle": "Cue In", "bVisible": false, "sClass": "sb-cue-in"},
+            /* cue out */ {"mDataProp": "cueout", "sTitle": "Cue Out", "bVisible": false, "sClass": "sb-cue-out"},
+            /* fade in */ {"mDataProp": "fadein", "sTitle": "Fade In", "bVisible": false, "sClass": "sb-fade-in"},
+            /* fade out */ {"mDataProp": "fadeout", "sTitle": "Fade Out", "bVisible": false, "sClass": "sb-fade-out"}
+            ],
+            
+            "bJQueryUI": true,
+            "bSort": false,
+            "bFilter": false,
+            "bProcessing": true,
+            "bServerSide": true,
+            "bInfo": false,
+            "bAutoWidth": false,
+            
+            "bStateSave": true,
+            "fnStateSaveParams": function (oSettings, oData) {
+                //remove oData components we don't want to save.
+                delete oData.oSearch;
+                delete oData.aoSearchCols;
+            },
+            "fnStateSave": function fnStateSave(oSettings, oData) {
+               
+                localStorage.setItem('datatables-timeline', JSON.stringify(oData));
+                
+                $.ajax({
+                  url: "/usersettings/set-timeline-datatable",
+                  type: "POST",
+                  data: {settings : oData, format: "json"},
+                  dataType: "json"
+                });
+            },
+            "fnStateLoad": function fnBuilderStateLoad(oSettings) {
+                var settings = localStorage.getItem('datatables-timeline');
+                
+                if (settings !== "") {
+                    return JSON.parse(settings);
+                }   
+            },
+            "fnStateLoadParams": function (oSettings, oData) {
+                var i,
+                    length,
+                    a = oData.abVisCols;
+            
+                //putting serialized data back into the correct js type to make
+                //sure everything works properly.
+                for (i = 0, length = a.length; i < length; i++) {   
+                    if (typeof(a[i]) === "string") {
+                        a[i] = (a[i] === "true") ? true : false;
+                    }
+                }
+                
+                a = oData.ColReorder;
+                for (i = 0, length = a.length; i < length; i++) {   
+                    if (typeof(a[i]) === "string") {
+                        a[i] = parseInt(a[i], 10);
+                    }
+                }
+               
+                oData.iCreate = parseInt(oData.iCreate, 10);
+            },
+            
+            "fnServerData": mod.fnServerData,
+            "fnRowCallback": function fnRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
+                var i, length,
+                    sSeparatorHTML,
+                    fnPrepareSeparatorRow,
+                    $node,
+                    cl="",
+                    //background-color to imitate calendar color.
+                    r,g,b,a,
+                    $nRow = $(nRow),
+                    $image,
+                    $div,
+                    headerIcon;
+                
+                fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
+                    
+                    $node = $(nRow.children[iNodeIndex]);
+                    $node.html(sRowContent);
+                    $node.attr('colspan',100);
+                    for (i = iNodeIndex + 1, length = nRow.children.length; i < length; i = i+1) {
+                        $node = $(nRow.children[i]);
+                        $node.html("");
+                        $node.attr("style", "display : none");
+                    }
+                    
+                    $nRow.addClass(sClass);
+                };
+                         
+                if (aData.header === true) {
+                    //remove the column classes from all tds.
+                    $nRow.find('td').removeClass();
+                    
+                    $node = $(nRow.children[0]);
+                    $node.html("");
+                    cl = 'sb-header';
+                    
+                    if (aData.record === true) {
+                        
+                        headerIcon =  (aData.soundcloud_id > 0) ? "soundcloud" : "recording";
+                        
+                        $div = $("<div/>", {
+                            "class": "small-icon " + headerIcon
+                        });
+                        $node.append($div);
+                    }
+                    else if (aData.rebroadcast === true) {
+                        $div = $("<div/>", {
+                            "class": "small-icon rebroadcast"
+                        });
+                        $node.append($div);
+                    }
+                    
+                    sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>';
+                    
+                    if (aData.rebroadcast === true) {
+                        sSeparatorHTML += '<span>'+aData.rebroadcast_title+'</span>';
+                    }
+                    
+                    sSeparatorHTML += '<span class="push-right">';
+                    
+                    if (aData.startDate === aData.endDate) {
+                        sSeparatorHTML += '<span class="show-date">'+aData.startDate+'</span><span class="show-time">'+aData.startTime+'</span>';
+                        sSeparatorHTML +='-<span class="show-time">'+aData.endTime+'</span>';
+                    }
+                    else {
+                        sSeparatorHTML += '<span class="show-date">'+aData.startDate+'</span><span class="show-time">'+aData.startTime+'</span>';
+                        sSeparatorHTML +='-<span class="show-date">'+aData.endDate+'</span><span class="show-time">'+aData.endTime+'</span>';
+                    }
+                    
+                    sSeparatorHTML += '</span>';
+                    
+                    fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
+                }
+                else if (aData.footer === true) {
+                    //remove the column classes from all tds.
+                    $nRow.find('td').removeClass();
+                    
+                    $node = $(nRow.children[0]);
+                    cl = 'sb-footer';
+                    
+                    //check the show's content status.
+                    if (aData.runtime > 0) {
+                        $node.html('<span class="ui-icon ui-icon-check"></span>');
+                        cl = cl + ' ui-state-highlight';
+                    }
+                    else {
+                        $node.html('<span class="ui-icon ui-icon-notice"></span>');
+                        cl = cl + ' ui-state-error';
+                    }
+                        
+                    sSeparatorHTML = '<span>'+aData.fRuntime+'</span>';
+                    fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
+                }
+                else if (aData.empty === true) {
+                    //remove the column classes from all tds.
+                    $nRow.find('td').removeClass();
+                    
+                    $node = $(nRow.children[0]);
+                    $node.html('');
+                    
+                    sSeparatorHTML = '<span>Show Empty</span>';
+                    cl = cl + " sb-empty odd";
+                    
+                    fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
+                }
+                else if (aData.record === true) {
+                    //remove the column classes from all tds.
+                    $nRow.find('td').removeClass();
+                    
+                    $node = $(nRow.children[0]);
+                    $node.html('');
+                    
+                    sSeparatorHTML = '<span>Recording From Line In</span>';
+                    cl = cl + " sb-record odd";
+                    
+                    fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
+                }
+                else {
+                    
+                     //add the play function if the file exists on disk.
+                    $image = $nRow.find('td.sb-image');
+                    //check if the file exists.
+                    if (aData.image === true) {
+                        $image.html('<img title="Track preview" src="/css/images/icon_audioclip.png"></img>')
+                            .click(function() {
+                                open_show_preview(aData.instance, aData.pos);
+                                return false;
+                            });
+                    }
+                    else {
+                        $image.html('<span class="ui-icon ui-icon-alert"></span>');
+                        $image.find(".ui-icon-alert").qtip({
+                            content: {
+                                text: "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't \"watched\" anymore."
+                            },
+                            style: {
+                                classes: "ui-tooltip-dark"
+                            },
+                            show: 'mouseover',
+                            hide: 'mouseout'
+                        });
+                    }
+                    
+                    $node = $(nRow.children[0]);
+                    if (aData.allowed === true && aData.scheduled >= 1) {
+                        $node.html('<input type="checkbox" name="'+aData.id+'"></input>');
+                    }
+                    else {
+                        $node.html('');
+                    }
+                }
+                
+                //add the show colour to the leftmost td
                 if (aData.footer !== true) {
-                	
-                	if ($nRow.hasClass('sb-header')) {
-                		a = 1;
-                	}
-                	else if ($nRow.hasClass('odd')) {
-                		a = 0.3;
-                	}
-                	else if ($nRow.hasClass('even')) {
-                		a = 0.4;
-                	}
-                	
-                	//convert from hex to rgb.
-                	r = parseInt((aData.backgroundColor).substring(0,2), 16);
-                	g = parseInt((aData.backgroundColor).substring(2,4), 16);
-                	b = parseInt((aData.backgroundColor).substring(4,6), 16);
-                	
-                	$nRow.find('td:first').css('background', 'rgba('+r+', '+g+', '+b+', '+a+')');
+                    
+                    if ($nRow.hasClass('sb-header')) {
+                        a = 1;
+                    }
+                    else if ($nRow.hasClass('odd')) {
+                        a = 0.3;
+                    }
+                    else if ($nRow.hasClass('even')) {
+                        a = 0.4;
+                    }
+                    
+                    //convert from hex to rgb.
+                    r = parseInt((aData.backgroundColor).substring(0,2), 16);
+                    g = parseInt((aData.backgroundColor).substring(2,4), 16);
+                    b = parseInt((aData.backgroundColor).substring(4,6), 16);
+                    
+                    $nRow.find('td:first').css('background', 'rgba('+r+', '+g+', '+b+', '+a+')');
                 }
                 
                 //save some info for reordering purposes.
-				$nRow.data({"aData": aData});
-				
-				if (aData.scheduled === 1) {
-					$nRow.addClass(NOW_PLAYING_CLASS);
-				}
-				else if (aData.scheduled === 0) {
-					$nRow.addClass("sb-past");
-				}
-				else {
-					$nRow.addClass("sb-future");
-				}
-				
-				if (aData.allowed !== true) {
-					$nRow.addClass("sb-not-allowed");
-				}
-				else {
-					$nRow.addClass("sb-allowed");
-				}
-				
-				//status used to colour tracks.
-				if (aData.status === 2) {
-					$nRow.addClass("sb-boundry");
-				}
-				else if (aData.status === 0) {
-					$nRow.addClass("sb-over");
-				}
-				
-				if (aData.currentShow === true) {
-					$nRow.addClass("sb-current-show");
-				}
+                $nRow.data({"aData": aData});
+                
+                if (aData.scheduled === 1) {
+                    $nRow.addClass(NOW_PLAYING_CLASS);
+                }
+                else if (aData.scheduled === 0) {
+                    $nRow.addClass("sb-past");
+                }
+                else {
+                    $nRow.addClass("sb-future");
+                }
+                
+                if (aData.allowed !== true) {
+                    $nRow.addClass("sb-not-allowed");
+                }
+                else {
+                    $nRow.addClass("sb-allowed");
+                }
+                
+                //status used to colour tracks.
+                if (aData.status === 2) {
+                    $nRow.addClass("sb-boundry");
+                }
+                else if (aData.status === 0) {
+                    $nRow.addClass("sb-over");
+                }
+                
+                if (aData.currentShow === true) {
+                    $nRow.addClass("sb-current-show");
+                }
                  
                 //call the context menu so we can prevent the event from propagating.
                 $nRow.find('td:gt(1)').click(function(e){
@@ -584,309 +594,309 @@ var AIRTIME = (function(AIRTIME){
                     
                     return false;
                 });
-			},
-			//remove any selected nodes before the draw.
-			"fnPreDrawCallback": function( oSettings ) {
-				
-				//make sure any dragging helpers are removed or else they'll be stranded on the screen.
-				$("#draggingContainer").remove();
-		    },
-			"fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
-				var wrapperDiv,
-					markerDiv,
-					$td,
-					aData,
-					elements,
-					i, length, temp,
-					$cursorRows,
-					$table = $(this),
-					$parent = $table.parent(),
-					//use this array to cache DOM heights then we can detach the table to manipulate it to increase speed.
-					heights = [];
-				
-				clearTimeout(mod.timeout);
-				
-				//only create the cursor arrows if the library is on the page.
-				if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
+            },
+            //remove any selected nodes before the draw.
+            "fnPreDrawCallback": function( oSettings ) {
+                
+                //make sure any dragging helpers are removed or else they'll be stranded on the screen.
+                $("#draggingContainer").remove();
+            },
+            "fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
+                var wrapperDiv,
+                    markerDiv,
+                    $td,
+                    aData,
+                    elements,
+                    i, length, temp,
+                    $cursorRows,
+                    $table = $(this),
+                    $parent = $table.parent(),
+                    //use this array to cache DOM heights then we can detach the table to manipulate it to increase speed.
+                    heights = [];
+                
+                clearTimeout(mod.timeout);
+                
+                //only create the cursor arrows if the library is on the page.
+                if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
 
-					$cursorRows = $sbTable.find("tbody tr.sb-future.sb-allowed:not(.sb-header, .sb-empty)");
-					
-					//need to get heights of tds while elements are still in the DOM.
-					for (i = 0, length = $cursorRows.length; i < length; i++) {
-						$td = $($cursorRows.get(i)).find("td:first");
-						heights.push($td.height());
-					}
-					
-					//detach the table to increase speed.
-					$table.detach();
-					
-					for (i = 0, length = $cursorRows.length; i < length; i++) {
-						
-						$td = $($cursorRows.get(i)).find("td:first");
-				    	if ($td.hasClass("dataTables_empty")) {
-				    		$parent.append($table);
-				    		return false;
-				    	}
-				    	
-				    	wrapperDiv = $("<div />", {
-				    		"class": "innerWrapper",
-				    		"css": {
-				    			"height": heights[i]
-				    		}
-				    	});
-				    	markerDiv = $("<div />", {
-				    		"class": "marker"
-				    	});
-				    	
-			    		$td.append(markerDiv).wrapInner(wrapperDiv);
-					}
-					
-					//if there is only 1 cursor on the page highlight it by default.
-					if ($cursorRows.length === 1) {
-						$td = $cursorRows.find("td:first");
-				    	if (!$td.hasClass("dataTables_empty")) {
-				    		$cursorRows.addClass("cursor-selected-row");
-				    	}
-					}
-					
-					$parent.append($table);
-				}
-				
-				//order of importance of elements for setting the next timeout.
-				elements = [
-				    $sbTable.find("tr."+NOW_PLAYING_CLASS),
-				    $sbTable.find("tbody").find("tr.sb-future.sb-footer, tr.sb-future.sb-header").filter(":first")
-				];
-				
-				//check which element we should set a timeout relative to.
-				for (i = 0, length = elements.length; i < length; i++) {
-					temp = elements[i];
-					
-					if (temp.length > 0) {
-						aData = temp.data("aData");
-						
-						mod.timeout = setTimeout(mod.refresh, aData.refresh * 1000); //need refresh in milliseconds
-						break;
-					}
-				}
-				
-				mod.checkToolBarIcons();
-		    },
-		    
-			"oColVis": {
-				"aiExclude": [ 0, 1 ]
-			},
-			
-			"oColReorder": {
-				"iFixedColumns": 2
-			},
-			
-	        // R = ColReorderResize, C = ColVis
-	        "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
-	        
-	        "sAjaxDataProp": "schedule",
-			"sAjaxSource": "/showbuilder/builder-feed"	
-		});
-		
-		$sbTable.find("tbody").on("click", "input:checkbox", function(ev) {
-        	
-        	var $cb = $(this),
-        		$tr = $cb.parents("tr"),
-        		$prev;
-        	
-        	if ($cb.is(":checked")) {
-        		
-        		if (ev.shiftKey) {
-        			$prev = $sbTable.find("tbody").find("tr."+SB_SELECTED_CLASS).eq(-1);
-        			
-        			$prev.nextUntil($tr)
-        				.addClass(SB_SELECTED_CLASS)
-        				.find("input:checkbox")
-        					.attr("checked", true)
-        					.end();
-        		}
-        		
-        		$tr.addClass(SB_SELECTED_CLASS);
-        	}
-        	else {
-        		$tr.removeClass(SB_SELECTED_CLASS);
-        	}
-        	
-        	mod.checkToolBarIcons();
+                    $cursorRows = $sbTable.find("tbody tr.sb-future.sb-allowed:not(.sb-header, .sb-empty)");
+                    
+                    //need to get heights of tds while elements are still in the DOM.
+                    for (i = 0, length = $cursorRows.length; i < length; i++) {
+                        $td = $($cursorRows.get(i)).find("td:first");
+                        heights.push($td.height());
+                    }
+                    
+                    //detach the table to increase speed.
+                    $table.detach();
+                    
+                    for (i = 0, length = $cursorRows.length; i < length; i++) {
+                        
+                        $td = $($cursorRows.get(i)).find("td:first");
+                        if ($td.hasClass("dataTables_empty")) {
+                            $parent.append($table);
+                            return false;
+                        }
+                        
+                        wrapperDiv = $("<div />", {
+                            "class": "innerWrapper",
+                            "css": {
+                                "height": heights[i]
+                            }
+                        });
+                        markerDiv = $("<div />", {
+                            "class": "marker"
+                        });
+                        
+                        $td.append(markerDiv).wrapInner(wrapperDiv);
+                    }
+                    
+                    //if there is only 1 cursor on the page highlight it by default.
+                    if ($cursorRows.length === 1) {
+                        $td = $cursorRows.find("td:first");
+                        if (!$td.hasClass("dataTables_empty")) {
+                            $cursorRows.addClass("cursor-selected-row");
+                        }
+                    }
+                    
+                    $parent.append($table);
+                }
+                
+                //order of importance of elements for setting the next timeout.
+                elements = [
+                    $sbTable.find("tr."+NOW_PLAYING_CLASS),
+                    $sbTable.find("tbody").find("tr.sb-future.sb-footer, tr.sb-future.sb-header").filter(":first")
+                ];
+                
+                //check which element we should set a timeout relative to.
+                for (i = 0, length = elements.length; i < length; i++) {
+                    temp = elements[i];
+                    
+                    if (temp.length > 0) {
+                        aData = temp.data("aData");
+                        
+                        mod.timeout = setTimeout(mod.refresh, aData.refresh * 1000); //need refresh in milliseconds
+                        break;
+                    }
+                }
+                
+                mod.checkToolBarIcons();
+            },
+            
+            "oColVis": {
+                "aiExclude": [ 0, 1 ]
+            },
+            
+            "oColReorder": {
+                "iFixedColumns": 2
+            },
+            
+            // R = ColReorderResize, C = ColVis
+            "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
+            
+            "sAjaxDataProp": "schedule",
+            "sAjaxSource": "/showbuilder/builder-feed"  
         });
-		
-		var sortableConf = (function(){
-			var origTrs,
-				aItemData = [],
-				oPrevData,
-				fnAdd,
-				fnMove,
-				fnReceive,
-				fnUpdate,
-				i, 
-				html,
-				helperData,
-				draggingContainer;
-			
-			fnAdd = function() {
-				var aMediaIds = [],
-					aSchedIds = [];
-				
-				for(i = 0; i < aItemData.length; i++) {
-					aMediaIds.push({"id": aItemData[i].id, "type": aItemData[i].ftype});
-				}
-				aSchedIds.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp});
-				
-				mod.fnAdd(aMediaIds, aSchedIds);
-			};
-			
-			fnMove = function() {
-				var aSelect = [],
-					aAfter = [];
-				
-				for(i = 0; i < helperData.length; i++) {
-					aSelect.push({"id": helperData[i].id, "instance": helperData[i].instance, "timestamp": helperData[i].timestamp});
-				}
-			
-				aAfter.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp});
-		
-				mod.fnMove(aSelect, aAfter);
-			};
-			
-			fnReceive = function(event, ui) {
-				var aItems = [];
-				
-				AIRTIME.library.addToChosen(ui.item);
-			
-				aItems = AIRTIME.library.getSelectedData();
-				origTrs = aItems;
-				html = ui.helper.html();
-				
-				AIRTIME.library.removeFromChosen(ui.item);
-			};
-			
-			fnUpdate = function(event, ui) {
-				var prev = ui.item.prev();
-				
-				//can't add items outside of shows.
-				if (prev.find("td:first").hasClass("dataTables_empty")
-						|| prev.length === 0) {
-					alert("Cannot schedule outside a show.");
-					ui.item.remove();
-					return;
-				}
-				
-				//if item is added after a footer, add the item after the last item in the show.
-				if (prev.hasClass("sb-footer")) {
-					prev = prev.prev();
-				}
-				
-				aItemData = [];
-				oPrevData = prev.data("aData");
-				
-				//item was dragged in
-				if (origTrs !== undefined) {
-					
-					$sbTable.find("tr.ui-draggable")
-						.empty()
-						.after(html);
-					
-					aItemData = origTrs;
-					origTrs = undefined;
-					fnAdd();
-				}
-				//item was reordered.
-				else {
-					
-					ui.item
-						.empty()
-						.after(draggingContainer.html());
-					
-					aItemData.push(ui.item.data("aData"));
-					fnMove();
-				}
-			};
-			
-			return {
-				placeholder: "sb-placeholder ui-state-highlight",
-				forcePlaceholderSize: true,
-				distance: 10,
-				helper: function(event, item) {
-					var selected = mod.getSelectedData(NOW_PLAYING_CLASS),	    	
-				    	thead = $("#show_builder_table thead"),
-				    	colspan = thead.find("th").length,
-				    	trfirst = thead.find("tr:first"),
-				    	width = trfirst.width(),
-				    	height = trfirst.height(),
-				    	message;
-					
-					//if nothing is checked select the dragged item.
-					if (selected.length === 0) {
-						selected = [item.data("aData")];
-					}
-					
-				    if (selected.length === 1) {
-				    	message = "Moving "+selected.length+" Item.";
-				    }
-				    else {
-				    	message = "Moving "+selected.length+" Items.";
-				    }
-				    
-				    draggingContainer = $('<tr/>')
-				    	.addClass('sb-helper')
-				    	.append('<td/>')
-				    	.find("td")
-				    		.attr("colspan", colspan)
-				    		.width(width)
-				    		.height(height)
-				    		.addClass("ui-state-highlight")
-				    		.append(message)
-				    		.end();
+        
+        $sbTable.find("tbody").on("click", "input:checkbox", function(ev) {
+            
+            var $cb = $(this),
+                $tr = $cb.parents("tr"),
+                $prev;
+            
+            if ($cb.is(":checked")) {
+                
+                if (ev.shiftKey) {
+                    $prev = $sbTable.find("tbody").find("tr."+SB_SELECTED_CLASS).eq(-1);
+                    
+                    $prev.nextUntil($tr)
+                        .addClass(SB_SELECTED_CLASS)
+                        .find("input:checkbox")
+                            .attr("checked", true)
+                            .end();
+                }
+                
+                $tr.addClass(SB_SELECTED_CLASS);
+            }
+            else {
+                $tr.removeClass(SB_SELECTED_CLASS);
+            }
+            
+            mod.checkToolBarIcons();
+        });
+        
+        var sortableConf = (function(){
+            var origTrs,
+                aItemData = [],
+                oPrevData,
+                fnAdd,
+                fnMove,
+                fnReceive,
+                fnUpdate,
+                i, 
+                html,
+                helperData,
+                draggingContainer;
+            
+            fnAdd = function() {
+                var aMediaIds = [],
+                    aSchedIds = [];
+                
+                for(i = 0; i < aItemData.length; i++) {
+                    aMediaIds.push({"id": aItemData[i].id, "type": aItemData[i].ftype});
+                }
+                aSchedIds.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp});
+                
+                mod.fnAdd(aMediaIds, aSchedIds);
+            };
+            
+            fnMove = function() {
+                var aSelect = [],
+                    aAfter = [];
+                
+                for(i = 0; i < helperData.length; i++) {
+                    aSelect.push({"id": helperData[i].id, "instance": helperData[i].instance, "timestamp": helperData[i].timestamp});
+                }
+            
+                aAfter.push({"id": oPrevData.id, "instance": oPrevData.instance, "timestamp": oPrevData.timestamp});
+        
+                mod.fnMove(aSelect, aAfter);
+            };
+            
+            fnReceive = function(event, ui) {
+                var aItems = [];
+                
+                AIRTIME.library.addToChosen(ui.item);
+            
+                aItems = AIRTIME.library.getSelectedData();
+                origTrs = aItems;
+                html = ui.helper.html();
+                
+                AIRTIME.library.removeFromChosen(ui.item);
+            };
+            
+            fnUpdate = function(event, ui) {
+                var prev = ui.item.prev();
+                
+                //can't add items outside of shows.
+                if (prev.find("td:first").hasClass("dataTables_empty")
+                        || prev.length === 0) {
+                    alert("Cannot schedule outside a show.");
+                    ui.item.remove();
+                    return;
+                }
+                
+                //if item is added after a footer, add the item after the last item in the show.
+                if (prev.hasClass("sb-footer")) {
+                    prev = prev.prev();
+                }
+                
+                aItemData = [];
+                oPrevData = prev.data("aData");
+                
+                //item was dragged in
+                if (origTrs !== undefined) {
+                    
+                    $sbTable.find("tr.ui-draggable")
+                        .empty()
+                        .after(html);
+                    
+                    aItemData = origTrs;
+                    origTrs = undefined;
+                    fnAdd();
+                }
+                //item was reordered.
+                else {
+                    
+                    ui.item
+                        .empty()
+                        .after(draggingContainer.html());
+                    
+                    aItemData.push(ui.item.data("aData"));
+                    fnMove();
+                }
+            };
+            
+            return {
+                placeholder: "sb-placeholder ui-state-highlight",
+                forcePlaceholderSize: true,
+                distance: 10,
+                helper: function(event, item) {
+                    var selected = mod.getSelectedData(NOW_PLAYING_CLASS),          
+                        thead = $("#show_builder_table thead"),
+                        colspan = thead.find("th").length,
+                        trfirst = thead.find("tr:first"),
+                        width = trfirst.width(),
+                        height = trfirst.height(),
+                        message;
+                    
+                    //if nothing is checked select the dragged item.
+                    if (selected.length === 0) {
+                        selected = [item.data("aData")];
+                    }
+                    
+                    if (selected.length === 1) {
+                        message = "Moving "+selected.length+" Item.";
+                    }
+                    else {
+                        message = "Moving "+selected.length+" Items.";
+                    }
+                    
+                    draggingContainer = $('<tr/>')
+                        .addClass('sb-helper')
+                        .append('<td/>')
+                        .find("td")
+                            .attr("colspan", colspan)
+                            .width(width)
+                            .height(height)
+                            .addClass("ui-state-highlight")
+                            .append(message)
+                            .end();
   
-				    helperData = selected;
-				    
-				    return draggingContainer; 
-			    },
-				items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing)',
-				cancel: '.sb-footer',
-				receive: fnReceive,
-				update: fnUpdate,
-				start: function(event, ui) {
-					/*
-					var elements = $sbTable.find('tr input:checked').parents('tr')
-						.not(ui.item)
-						.not("."+NOW_PLAYING_CLASS);
-					
-					//remove all other items from the screen, 
-					//don't remove ui.item or else we can not get position information when the user drops later.
-					elements.remove();
-					*/
-					
-					var elements = $sbTable.find('tr input:checked').parents('tr').not("."+NOW_PLAYING_CLASS);
-					
-					elements.hide();
-				}
-			};
-		}());
-		
-		$sbTable.sortable(sortableConf);
-		
-		//start setup of the builder toolbar.
-		$toolbar = $(".sb-content .fg-toolbar");
-		
-		$ul = $("<ul/>");
-		$ul.append('<li class="ui-state-default sb-button-select" title="Select"><span class="ui-icon ui-icon-document-b"></span></li>')
-			.append('<li class="ui-state-default ui-state-disabled sb-button-trim" title="Delete all overbooked tracks"><span class="ui-icon ui-icon-scissors"></span></li>')
-			.append('<li class="ui-state-default ui-state-disabled sb-button-delete" title="Delete selected scheduled items"><span class="ui-icon ui-icon-trash"></span></li>');	
-		$toolbar.append($ul);
-		
-		$ul = $("<ul/>");
-		$ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>')
-			.append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>');
-		$toolbar.append($ul);
-		$ul = undefined;
-		
-		$.contextMenu({
+                    helperData = selected;
+                    
+                    return draggingContainer; 
+                },
+                items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing)',
+                cancel: '.sb-footer',
+                receive: fnReceive,
+                update: fnUpdate,
+                start: function(event, ui) {
+                    /*
+                    var elements = $sbTable.find('tr input:checked').parents('tr')
+                        .not(ui.item)
+                        .not("."+NOW_PLAYING_CLASS);
+                    
+                    //remove all other items from the screen, 
+                    //don't remove ui.item or else we can not get position information when the user drops later.
+                    elements.remove();
+                    */
+                    
+                    var elements = $sbTable.find('tr input:checked').parents('tr').not("."+NOW_PLAYING_CLASS);
+                    
+                    elements.hide();
+                }
+            };
+        }());
+        
+        $sbTable.sortable(sortableConf);
+        
+        //start setup of the builder toolbar.
+        $toolbar = $(".sb-content .fg-toolbar");
+        
+        $ul = $("<ul/>");
+        $ul.append('<li class="ui-state-default sb-button-select" title="Select"><span class="ui-icon ui-icon-document-b"></span></li>')
+            .append('<li class="ui-state-default ui-state-disabled sb-button-trim" title="Delete all overbooked tracks"><span class="ui-icon ui-icon-scissors"></span></li>')
+            .append('<li class="ui-state-default ui-state-disabled sb-button-delete" title="Delete selected scheduled items"><span class="ui-icon ui-icon-trash"></span></li>');    
+        $toolbar.append($ul);
+        
+        $ul = $("<ul/>");
+        $ul.append('<li class="ui-state-default ui-state-disabled sb-button-current" title="Jump to the currently playing track"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>')
+            .append('<li class="ui-state-default ui-state-disabled sb-button-cancel" title="Cancel current show"><span class="ui-icon ui-icon-eject"></span></li>');
+        $toolbar.append($ul);
+        $ul = undefined;
+        
+        $.contextMenu({
             selector: '#show_builder .ui-icon-document-b',
             trigger: "left",
             ignoreRightClick: true,
@@ -895,110 +905,110 @@ var AIRTIME = (function(AIRTIME){
                 "sn": {name: "Select None", callback: mod.selectNone}
             }
         });
-		
-		//jump to current
-		$toolbar.find('.sb-button-cancel')
-			.click(function() {
-				var $tr,
-					data,
-					msg = 'Cancel Current Show?';
-				
-				if (AIRTIME.button.isDisabled('sb-button-cancel') === true) {
-					return;
-				}
-				
-				$tr = $sbTable.find('tr.sb-future:first');
-				
-				if ($tr.hasClass('sb-current-show')) {
-					data = $tr.data("aData");
-					
-					if (data.record === true) {
-						msg = 'Stop recording current show?';
-					}
-					
-					if (confirm(msg)) {
-				        var url = "/Schedule/cancel-current-show";
-				        $.ajax({
-				        	url: url,
-				        	data: {format: "json", id: data.instance},
-				        	success: function(data){
-				        		var oTable = $sbTable.dataTable();
-				        		oTable.fnDraw();
-				        	}
-				        });
-				    }
-				}	
-			});
-		
-		//jump to current
-		$toolbar.find('.sb-button-current')
-			.click(function() {
-				
-				if (AIRTIME.button.isDisabled('sb-button-current') === true) {
-					return;
-				}
-				
-				var $scroll = $sbContent.find(".dataTables_scrolling"),
-					scrolled = $scroll.scrollTop(),
-					scrollingTop = $scroll.offset().top,
-					current = $sbTable.find("."+NOW_PLAYING_CLASS),
-					currentTop = current.offset().top;
-		
-				$scroll.scrollTop(currentTop - scrollingTop + scrolled);
-			});
-		
-		//delete overbooked tracks.
-		$toolbar.find('.sb-button-trim')
-			.click(function() {
-				
-				if (AIRTIME.button.isDisabled('sb-button-trim') === true) {
-					return;
-				}
-				
-				var temp,
-					aItems = [],
-					trs = $sbTable.find(".sb-over.sb-future.sb-allowed");
-		
-				trs.each(function(){
-					temp = $(this).data("aData");
-					aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp}); 	
-				});
-				
-				mod.fnRemove(aItems);
-			});
-		
-		//delete selected tracks
-		$toolbar.find('.sb-button-delete')
-			.click(function() {
-				
-				if (AIRTIME.button.isDisabled('sb-button-delete') === true) {
-					return;
-				}
-				
-				mod.fnRemoveSelectedItems();
-			});
-		
-		//add events to cursors.
-		$sbTable.find("tbody").on("click", "div.marker", function(event) {
-			var $tr = $(this).parents("tr"),
-				$trs;
-			
-			if ($tr.hasClass(CURSOR_SELECTED_CLASS)) {
-				mod.removeCursor($tr);
-			}
-			else {
-				mod.selectCursor($tr);
-			}
-			
-			if (event.ctrlKey === false) {
-				$trs = $sbTable.find('.'+CURSOR_SELECTED_CLASS).not($tr);
-				mod.removeCursor($trs);
-			}
-			
-			return false;
-		});
-		
-		//begin context menu initialization.
+        
+        //jump to current
+        $toolbar.find('.sb-button-cancel')
+            .click(function() {
+                var $tr,
+                    data,
+                    msg = 'Cancel Current Show?';
+                
+                if (AIRTIME.button.isDisabled('sb-button-cancel') === true) {
+                    return;
+                }
+                
+                $tr = $sbTable.find('tr.sb-future:first');
+                
+                if ($tr.hasClass('sb-current-show')) {
+                    data = $tr.data("aData");
+                    
+                    if (data.record === true) {
+                        msg = 'Stop recording current show?';
+                    }
+                    
+                    if (confirm(msg)) {
+                        var url = "/Schedule/cancel-current-show";
+                        $.ajax({
+                            url: url,
+                            data: {format: "json", id: data.instance},
+                            success: function(data){
+                                var oTable = $sbTable.dataTable();
+                                oTable.fnDraw();
+                            }
+                        });
+                    }
+                }   
+            });
+        
+        //jump to current
+        $toolbar.find('.sb-button-current')
+            .click(function() {
+                
+                if (AIRTIME.button.isDisabled('sb-button-current') === true) {
+                    return;
+                }
+                
+                var $scroll = $sbContent.find(".dataTables_scrolling"),
+                    scrolled = $scroll.scrollTop(),
+                    scrollingTop = $scroll.offset().top,
+                    current = $sbTable.find("."+NOW_PLAYING_CLASS),
+                    currentTop = current.offset().top;
+        
+                $scroll.scrollTop(currentTop - scrollingTop + scrolled);
+            });
+        
+        //delete overbooked tracks.
+        $toolbar.find('.sb-button-trim')
+            .click(function() {
+                
+                if (AIRTIME.button.isDisabled('sb-button-trim') === true) {
+                    return;
+                }
+                
+                var temp,
+                    aItems = [],
+                    trs = $sbTable.find(".sb-over.sb-future.sb-allowed");
+        
+                trs.each(function(){
+                    temp = $(this).data("aData");
+                    aItems.push({"id": temp.id, "instance": temp.instance, "timestamp": temp.timestamp});   
+                });
+                
+                mod.fnRemove(aItems);
+            });
+        
+        //delete selected tracks
+        $toolbar.find('.sb-button-delete')
+            .click(function() {
+                
+                if (AIRTIME.button.isDisabled('sb-button-delete') === true) {
+                    return;
+                }
+                
+                mod.fnRemoveSelectedItems();
+            });
+        
+        //add events to cursors.
+        $sbTable.find("tbody").on("click", "div.marker", function(event) {
+            var $tr = $(this).parents("tr"),
+                $trs;
+            
+            if ($tr.hasClass(CURSOR_SELECTED_CLASS)) {
+                mod.removeCursor($tr);
+            }
+            else {
+                mod.selectCursor($tr);
+            }
+            
+            if (event.ctrlKey === false) {
+                $trs = $sbTable.find('.'+CURSOR_SELECTED_CLASS).not($tr);
+                mod.removeCursor($trs);
+            }
+            
+            return false;
+        });
+        
+        //begin context menu initialization.
         $.contextMenu({
             selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header, .sb-record) td:not(.sb-checkbox, .sb-image)',
             trigger: "left",
@@ -1006,30 +1016,30 @@ var AIRTIME = (function(AIRTIME){
             
             build: function($el, e) {
                 var items,  
-	                $tr = $el.parent(),
-	                data = $tr.data("aData"), 
-	                cursorClass = "cursor-selected-row",
-	                callback;
+                    $tr = $el.parent(),
+                    data = $tr.data("aData"), 
+                    cursorClass = "cursor-selected-row",
+                    callback;
 
                 function processMenuItems(oItems) {
-                	
-                	//define a preview callback.
+                    
+                    //define a preview callback.
                     if (oItems.preview !== undefined) {
                         
                         callback = function() {
-                        	open_show_preview(data.instance, data.pos);
+                            open_show_preview(data.instance, data.pos);
                         };
                         
                         oItems.preview.callback = callback;
                     }
                     
-                	//define a select cursor callback.
+                    //define a select cursor callback.
                     if (oItems.selCurs !== undefined) {
                         
                         callback = function() {
-                        	var $tr = $(this).parents('tr').next();
-                        	
-                        	mod.selectCursor($tr);
+                            var $tr = $(this).parents('tr').next();
+                            
+                            mod.selectCursor($tr);
                         };
                         
                         oItems.selCurs.callback = callback;
@@ -1039,9 +1049,9 @@ var AIRTIME = (function(AIRTIME){
                     if (oItems.delCurs !== undefined) {
                         
                         callback = function() {
-                        	var $tr = $(this).parents('tr').next();
-                        	
-                        	mod.removeCursor($tr);
+                            var $tr = $(this).parents('tr').next();
+                            
+                            mod.removeCursor($tr);
                         };
                         
                         oItems.delCurs.callback = callback;
@@ -1051,13 +1061,13 @@ var AIRTIME = (function(AIRTIME){
                     if (oItems.del !== undefined) {
                         
                         callback = function() {
-                        	if (confirm("Delete selected Items?")) {
-                        		AIRTIME.showbuilder.fnRemove([{
-                                	id: data.id,
-                                	timestamp: data.timestamp,
-                                	instance: data.instance
+                            if (confirm("Delete selected Items?")) {
+                                AIRTIME.showbuilder.fnRemove([{
+                                    id: data.id,
+                                    timestamp: data.timestamp,
+                                    instance: data.instance
                                 }]);
-                        	} 
+                            } 
                         };
                         
                         oItems.del.callback = callback;
@@ -1065,18 +1075,18 @@ var AIRTIME = (function(AIRTIME){
                     
                     //only show the cursor selecting options if the library is visible on the page.
                     if ($tr.next().find('.marker').length === 0) {
-                    	delete oItems.selCurs;
-                    	delete oItems.delCurs;
+                        delete oItems.selCurs;
+                        delete oItems.delCurs;
                     }
-                	//check to include either select or remove cursor.
+                    //check to include either select or remove cursor.
                     else {
-                		if ($tr.next().hasClass(cursorClass)) {
-                    		delete oItems.selCurs;
-                    	}
-                    	else {
-                    		delete oItems.delCurs;
-                    	}
-                	}     	
+                        if ($tr.next().hasClass(cursorClass)) {
+                            delete oItems.selCurs;
+                        }
+                        else {
+                            delete oItems.delCurs;
+                        }
+                    }       
                            
                     items = oItems;
                 }
@@ -1092,14 +1102,14 @@ var AIRTIME = (function(AIRTIME){
                   }
                 });
 
-            	return {
+                return {
                     items: items
                 };
     
             }
-        });	
-	};
-	
-	return AIRTIME;
-	
-}(AIRTIME || {}));
\ No newline at end of file
+        }); 
+    };
+    
+    return AIRTIME;
+    
+}(AIRTIME || {}));
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
index 3bf5891bb..35c1830e6 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
@@ -97,10 +97,12 @@ class AirtimeMetadata:
                     
                     if value is not None:
                         value = unicode(value)
+                    else:
+                        value = unicode('');
                     
-                        if len(value) > 0:
-                            self.logger.debug("Saving key '%s' with value '%s' to file", key, value)
-                            airtime_file[self.airtime2mutagen[key]] = value
+                        #if len(value) > 0:
+                    self.logger.debug("Saving key '%s' with value '%s' to file", key, value)
+                    airtime_file[self.airtime2mutagen[key]] = value
 
             airtime_file.save()
         except Exception, e: