diff --git a/src/assets/backgrounds/browse-dirble.jpg b/src/assets/backgrounds/browse-dirble.jpg
new file mode 100755
index 000000000..d2eafefcf
Binary files /dev/null and b/src/assets/backgrounds/browse-dirble.jpg differ
diff --git a/src/assets/backgrounds/browse-itunes.jpg b/src/assets/backgrounds/browse-itunes.jpg
new file mode 100755
index 000000000..ba956c64f
Binary files /dev/null and b/src/assets/backgrounds/browse-itunes.jpg differ
diff --git a/src/assets/backgrounds/browse-somafm.jpg b/src/assets/backgrounds/browse-somafm.jpg
new file mode 100755
index 000000000..c671194be
Binary files /dev/null and b/src/assets/backgrounds/browse-somafm.jpg differ
diff --git a/src/assets/backgrounds/browse-soundcloud.jpg b/src/assets/backgrounds/browse-soundcloud.jpg
new file mode 100755
index 000000000..94797f4a8
Binary files /dev/null and b/src/assets/backgrounds/browse-soundcloud.jpg differ
diff --git a/src/assets/backgrounds/browse-spotify.jpg b/src/assets/backgrounds/browse-spotify.jpg
index 34e829529..aeb0aef54 100755
Binary files a/src/assets/backgrounds/browse-spotify.jpg and b/src/assets/backgrounds/browse-spotify.jpg differ
diff --git a/src/js/components/Modal/EditRadioModal.js b/src/js/components/Modal/EditRadioModal.js
index 84260fb7f..9bea050ef 100755
--- a/src/js/components/Modal/EditRadioModal.js
+++ b/src/js/components/Modal/EditRadioModal.js
@@ -45,19 +45,23 @@ export default class EditRadioModal extends React.Component{
 
 	addSeed(){
 		if (this.state.uri == ''){
-			this.setState({error_message: 'Cannot be empty'})
-			return null
+			this.setState({error_message: 'Cannot be empty'});
+			return null;
 		}
 
-		var seeds = Object.assign([],this.state.seeds)
-		var uris = this.state.uri.split(',')
+		var seeds = Object.assign([],this.state.seeds);
+		var uris = this.state.uri.split(',');
 
 		for (var i = 0; i < uris.length; i++){
+			if (helpers.uriSource(uris[i]) !== 'spotify'){
+				this.setState({error_message: 'Non-Spotify URIs not supported'});
+				return;
+			}
 			if (seeds.indexOf(uris[i]) > -1){
-				this.setState({error_message: 'URI already added'})
+				this.setState({error_message: 'URI already added'});
 			} else {
-				seeds.push(uris[i])
-				this.setState({error_message: null})
+				seeds.push(uris[i]);
+				this.setState({error_message: null});
 			}			
 		}
 
diff --git a/src/js/views/Queue.js b/src/js/views/Queue.js
index 4a9c43c6c..2f7b4d428 100755
--- a/src/js/views/Queue.js
+++ b/src/js/views/Queue.js
@@ -115,7 +115,7 @@ class Queue extends React.Component{
 						track,
 						this.props.queue_metadata["tlid_"+track.tlid],
 						{
-							playing: (track.tlid == this.props.current_track.tlid)
+							playing: (this.props.current_track && this.props.current_track.tlid == track.tlid)
 						}
 					);
 					tracks[i] = track;
diff --git a/src/js/views/library/LibraryBrowse.js b/src/js/views/library/LibraryBrowse.js
index ad2a22d64..ecbfc0fff 100755
--- a/src/js/views/library/LibraryBrowse.js
+++ b/src/js/views/library/LibraryBrowse.js
@@ -145,6 +145,10 @@ class LibraryBrowse extends React.Component{
 				var directory = this.props.directory[i]
 
 				switch (directory.name){
+					case 'Dirble':
+						directory.icons = ['assets/backgrounds/browse-dirble.jpg']
+						break
+
 					case 'Files':
 						directory.icons = ['assets/backgrounds/browse-folders.jpg']
 						break
@@ -167,6 +171,18 @@ class LibraryBrowse extends React.Component{
 						directory.icons = ['assets/backgrounds/browse-tunein.jpg']
 						break
 
+					case 'SoundCloud':
+						directory.icons = ['assets/backgrounds/browse-soundcloud.jpg']
+						break
+
+					case 'iTunes Store: Podcasts':
+						directory.icons = ['assets/backgrounds/browse-itunes.jpg']
+						break
+
+					case 'Soma FM':
+						directory.icons = ['assets/backgrounds/browse-somafm.jpg']
+						break
+
 					default:
 						directory.icons = ['assets/backgrounds/browse-default.jpg']
 				}