Index: HTML/EN/plugins/RandomPlay/randomplay_list.html
===================================================================
--- HTML/EN/plugins/RandomPlay/randomplay_list.html	(revision 4744)
+++ HTML/EN/plugins/RandomPlay/randomplay_list.html	(working copy)
@@ -5,7 +5,6 @@
 		 onclick='document.genreForm.type.value = "[% type %]";
 							document.genreForm.addOnly.value = [% addOnly %]
 							document.genreForm.submit();
-							for (var i=0; i < parent.frames.length; i++) if (parent.frames[i].name == "status") parent.frames[i].location.reload(true);
 							return false;'
 	>
 	  [% IF type == "disable" %]
@@ -21,8 +20,19 @@
 [% PROCESS pageheader.html %]
 
 <tr>
-	<td></td>
 	<td>
+		[% IF pluginRandomNowPlaying != '' %]
+			[%# Reload status and playlist to reflect any new mixes %]
+			<script type="text/javascript">
+				for (var i=0; i < parent.frames.length; i++) {
+					if (parent.frames[i].name == "status") {
+						parent.frames[i].location.reload(true);
+					}
+				}			
+			</script>
+		[% END %]
+	</td>
+	<td>
 		<p>
 		<h3>[% "PLUGIN_RANDOM" | string %]</h3>
 
Index: HTML/Default/plugins/RandomPlay/randomplay_list.html
===================================================================
--- HTML/Default/plugins/RandomPlay/randomplay_list.html	(revision 4744)
+++ HTML/Default/plugins/RandomPlay/randomplay_list.html	(working copy)
@@ -5,7 +5,6 @@
 		 onclick='document.genreForm.type.value = "[% type %]";
 							document.genreForm.addOnly.value = [% addOnly %]
 							document.genreForm.submit();
-							for (var i=0; i < parent.frames.length; i++) if (parent.frames[i].name == "status") parent.frames[i].location.reload(true);
 							return false;'
 	>
 	  [% IF type == "disable" %]
@@ -22,6 +21,16 @@
 
 <tr height="44">
 	<td width="4" height="44">
+		[% IF pluginRandomNowPlaying != '' %]
+			[%# Reload status and playlist to reflect any new mixes %]
+			<script type="text/javascript">
+				for (var i=0; i < parent.frames.length; i++) {
+					if (parent.frames[i].name == "status") {
+						parent.frames[i].location.reload(true);
+					}
+				}			
+			</script>
+		[% END %]
 		<img src="[% webroot %]html/images/spacer.gif" width="8" height="39" alt="">
 	</td>
 	<td valign="top" class="medgrey" height="44">
Index: HTML/Handheld/plugins/RandomPlay/randomplay_list.html
===================================================================
--- HTML/Handheld/plugins/RandomPlay/randomplay_list.html	(revision 4744)
+++ HTML/Handheld/plugins/RandomPlay/randomplay_list.html	(working copy)
@@ -5,7 +5,6 @@
 		onClick='document.genreForm.type.value = "[% type %]";
 		document.genreForm.addOnly.value = [% addOnly %]
 		document.genreForm.submit();
-		for (var i=0; i < parent.frames.length; i++) if (parent.frames[i].name == "status") parent.frames[i].location.reload(true);
 		return false;'>
 	[%- IF type == "disable" -%]
 		[% "PLUGIN_RANDOM_" _ pluginRandomNowPlaying _ "_DISABLE" | string %].
@@ -52,17 +51,17 @@
 
 			<p>
 				[% "PLUGIN_RANDOM_GENERAL_HELP" | string %]
-				[% PROCESS playLink type="disable" addOnly="0" %]			
+				[% PROCESS playLink type="disable" addOnly="0" %]
 			</p>
 
 		[% END %]
-	[% END %]	
+	[% END %]
 
 	<hr>
 
 	<p>[% "PLUGIN_RANDOM_GENRE_FILTER_WEB" | string %]</p>
 
-	
+
 	<table cellspacing="0" border="0" cellpadding="4" width="100%">
 		<tr>
 			<td>
@@ -87,7 +86,7 @@
 					var numCheckBoxes = 0;
 					var selectAllString = '[% "PLUGIN_RANDOM_SELECT_ALL" | string %]';
 					var selectNoneString = '[% "PLUGIN_RANDOM_SELECT_NONE" | string %]';
-					
+
 					// Work out how many checkboxes are initially selected
 					for (var i=0; i < f.elements.length; i++) {
 						if (f.elements[i].type == 'checkbox') {
@@ -97,11 +96,11 @@
 							}
 						}
 					}
-					
+
 					// Select none if all are selected, else select all
 					function selectAll() {
 						var newState = numSelected != numCheckBoxes;
-						
+
 						for (var i=0; i < f.elements.length; i++) {
 							if (f.elements[i].type == 'checkbox') {
 								f.elements[i].checked = newState;
@@ -115,7 +114,7 @@
 							f.selectAllButton.value = selectAllString;
 						}
 					}
-					
+
 					// Increase/decrease num selected every time a checkbox changes
 					function changeNumSelected(checkBox) {
 						if (checkBox.checked) {
@@ -123,24 +122,24 @@
 						} else {
 							numSelected--;
 						}
-						
+
 						if (numSelected == numCheckBoxes) {
 						  f.selectAllButton.value = selectNoneString;
 						} else {
 							f.selectAllButton.value = selectAllString;
 						}
 					}
-					
+
 					// Write the button using js, so it won't appear if js isn't enabled/available
 					document.write('<input type="button" value="'
-					               + (numSelected == numCheckBoxes ? selectNoneString : selectAllString) 
+					               + (numSelected == numCheckBoxes ? selectNoneString : selectAllString)
 												 + '" id="selectAllButton" onclick="selectAll()">');
 				// -->
 				</script>
 			</td>
 		</tr>
 	</table>
-		
+
 	<p>[% "PLUGIN_RANDOM_BEFORE_NUM_TRACKS" | string %]
 		<input class="stdedit" type="text" size="2" name="numTracks" value="[% pluginRandomNumTracks %]">
 		[% "PLUGIN_RANDOM_AFTER_NUM_TRACKS" | string %]
Index: HTML/Fishbone/plugins/RandomPlay/randomplay_list.html
===================================================================
--- HTML/Fishbone/plugins/RandomPlay/randomplay_list.html	(revision 4744)
+++ HTML/Fishbone/plugins/RandomPlay/randomplay_list.html	(working copy)
@@ -5,12 +5,11 @@
 		 onclick='document.genreForm.type.value = "[% type %]";
 							document.genreForm.addOnly.value = [% addOnly %]
 							document.genreForm.submit();
-							for (var i=0; i < parent.frames.length; i++) if (parent.frames[i].name == "status") parent.frames[i].location.reload(true);
 							return false;'
 	>
 	  [% IF type == "disable" %]
 	  	[% "PLUGIN_RANDOM_" _ pluginRandomNowPlaying _ "_DISABLE" | string %].
-		[% ELSIF addOnly %]						
+		[% ELSIF addOnly %]
 					<img src="[% webroot %]html/images/add.gif" border="0" width="9" height="11" align="center"
 						alt='[% "ADD" | string %]' title='[% "ADD" | string %]'>
 		[% ELSE %]
@@ -23,8 +22,19 @@
 [% PROCESS pageheader.html %]
 
 <tr>
-	<td></td
 	<td>
+		[% IF pluginRandomNowPlaying != '' %]
+			[%# Reload status and playlist to reflect any new mixes %]
+			<script type="text/javascript">
+				for (var i=0; i < parent.frames.length; i++) {
+					if (parent.frames[i].name == "status") {
+						parent.frames[i].location.reload(true);
+					}
+				}
+			</script>
+		[% END %]
+	</td>
+	<td>
 		<p>
 		<h3>[% "PLUGIN_RANDOM" | string %]</h3>
 
@@ -34,7 +44,7 @@
 			  [% "PLUGIN_RANDOM" | string %]
 			</a>
 		</p>
-		
+
 		<form action="[% webroot %]plugins/RandomPlay/randomplay_settings.html" name="genreForm">
 			<input type="hidden" name="type" value="">
 			<input type="hidden" name="addOnly" value="0">
@@ -46,11 +56,11 @@
 						<td>[% "NO_PLAYER_FOUND" | string %]</td>
 					</tr>
 				[% ELSE %]
-									
+
 					<tr>
 						<td>[% "PLUGIN_RANDOM_CHOOSE_BELOW" | string %]</td>
 					</tr>
-		
+
 					<tr>
 						<td></td>
 					</tr>
@@ -61,7 +71,7 @@
 						<td class="listing">[% PROCESS playLink type="$type" addOnly="1" %]</td>
 					</tr>
 					[% END %]
-					
+
 					[% IF pluginRandomNowPlaying != '' %]
 						<tr>
 							<td>&nbsp;</td>
@@ -72,12 +82,12 @@
 								[% "PLUGIN_RANDOM_" _ pluginRandomNowPlaying | upper | string %]
 							</td>
 						</tr>
-	
+
 						<tr>
 							<td>
 								<em>
 									[% "PLUGIN_RANDOM_GENERAL_HELP" | string %]
-									[% PROCESS playLink type="disable" addOnly="0" %]			
+									[% PROCESS playLink type="disable" addOnly="0" %]
 								</em>
 							</td>
 						</tr>
@@ -86,8 +96,8 @@
 							<td>&nbsp;</td>
 						</tr>
 					[% END %]
-				[% END %]	
-				
+				[% END %]
+
 				<tr>
 					<td colspan="4"><hr></td>
 				</tr>
@@ -119,7 +129,7 @@
 							var numCheckBoxes = 0;
 							var selectAllString = '[% "PLUGIN_RANDOM_SELECT_ALL" | string %]';
 							var selectNoneString = '[% "PLUGIN_RANDOM_SELECT_NONE" | string %]';
-							
+
 							// Work out how many checkboxes are initially selected
 							for (var i=0; i < f.elements.length; i++) {
 								if (f.elements[i].type == 'checkbox') {
@@ -129,11 +139,11 @@
 									}
 								}
 							}
-							
+
 							// Select none if all are selected, else select all
 							function selectAll() {
 								var newState = numSelected != numCheckBoxes;
-								
+
 								for (var i=0; i < f.elements.length; i++) {
 									if (f.elements[i].type == 'checkbox') {
 										f.elements[i].checked = newState;
@@ -147,7 +157,7 @@
 									f.selectAllButton.value = selectAllString;
 								}
 							}
-							
+
 							// Increase/decrease num selected every time a checkbox changes
 							function changeNumSelected(checkBox) {
 								if (checkBox.checked) {
@@ -155,23 +165,23 @@
 								} else {
 									numSelected--;
 								}
-								
+
 								if (numSelected == numCheckBoxes) {
 								  f.selectAllButton.value = selectNoneString;
 								} else {
 									f.selectAllButton.value = selectAllString;
 								}
 							}
-							
+
 							// Write the button using js, so it won't appear if js isn't enabled/available
 							document.write('<input type="button" value="'
-							               + (numSelected == numCheckBoxes ? selectNoneString : selectAllString) 
+							               + (numSelected == numCheckBoxes ? selectNoneString : selectAllString)
 														 + '" id="selectAllButton" onclick="selectAll()">');
 						// -->
 						</script>
 					</td>
 				</tr>
-				
+
 				<tr>
 					<td>&nbsp;</td>
 				</tr>