diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b3d95ebb..e4c45f96 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
     package="com.thejoshwa.ultrasonic.androidapp"
     a:installLocation="auto"
-    a:versionCode="29"
-    a:versionName="1.2.0.2" >
+    a:versionCode="30"
+    a:versionName="1.2.0.3" >
 
     <uses-permission a:name="android.permission.INTERNET" />
     <uses-permission a:name="android.permission.READ_PHONE_STATE" />
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 925294f5..8b309959 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -39,11 +39,6 @@
             a:key="discAndTrackSort"
             a:summary="@string/settings.disc_sort_summary"
             a:title="@string/settings.disc_sort" />
-        <CheckBoxPreference
-            a:defaultValue="true"
-            a:key="showNowPlaying"
-            a:summary="@string/settings.show_now_playing_summary"
-            a:title="@string/settings.show_now_playing" />
     </PreferenceCategory>
     <PreferenceCategory a:title="@string/settings.playback_control_title" >
         <CheckBoxPreference
@@ -89,6 +84,11 @@
             a:title="@string/settings.increment_time" />
     </PreferenceCategory>
 	<PreferenceCategory a:title="@string/settings.notifications_title" >
+        <CheckBoxPreference
+            a:defaultValue="true"
+            a:key="showNowPlaying"
+            a:summary="@string/settings.show_now_playing_summary"
+            a:title="@string/settings.show_now_playing" />	    
 	    <CheckBoxPreference
             a:defaultValue="true"
             a:key="showNotification"
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
index a5248d4e..ea2f9978 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectAlbumActivity.java
@@ -468,7 +468,8 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         new LoadTask() {
             @Override
             protected MusicDirectory load(MusicService service) throws Exception {
-            	return service.getVideos(SelectAlbumActivity.this,  this);
+            	boolean refresh = getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_REFRESH, false);
+            	return service.getVideos(refresh, SelectAlbumActivity.this,  this);
             }
         }.execute();
     }
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java
index 575a6890..8b2d2f6e 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/service/CachedMusicService.java
@@ -40,6 +40,7 @@ import com.thejoshwa.ultrasonic.androidapp.domain.SearchResult;
 import com.thejoshwa.ultrasonic.androidapp.domain.Share;
 import com.thejoshwa.ultrasonic.androidapp.domain.Version;
 import com.thejoshwa.ultrasonic.androidapp.util.CancellableTask;
+import com.thejoshwa.ultrasonic.androidapp.util.Constants;
 import com.thejoshwa.ultrasonic.androidapp.util.LRUCache;
 import com.thejoshwa.ultrasonic.androidapp.util.ProgressListener;
 import com.thejoshwa.ultrasonic.androidapp.util.TimeLimitedCache;
@@ -392,15 +393,19 @@ public class CachedMusicService implements MusicService {
 	}
 
 	@Override
-	public MusicDirectory getVideos(Context context, ProgressListener progressListener) throws Exception {
-        checkSettingsChanged(context);
-        MusicDirectory result = cachedVideos.get();
-        
-        if (result == null) {
-            result = musicService.getVideos(context, progressListener);
-            cachedVideos.set(result);
-        }
-        
-        return result;
+	public MusicDirectory getVideos(boolean refresh, Context context, ProgressListener progressListener) throws Exception {
+		checkSettingsChanged(context);
+		TimeLimitedCache<MusicDirectory> cache = refresh ? null : cachedMusicDirectories.get(Constants.INTENT_EXTRA_NAME_VIDEOS);
+
+		MusicDirectory dir = cache == null ? null : cache.get();
+
+		if (dir == null) {
+			dir = musicService.getVideos(refresh, context, progressListener);
+			cache = new TimeLimitedCache<MusicDirectory>(Util.getDirectoryCacheTime(context), TimeUnit.SECONDS);
+			cache.set(dir);
+			cachedMusicDirectories.put(Constants.INTENT_EXTRA_NAME_VIDEOS, cache);
+		}
+
+		return dir;
 	}
 }
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java
index 9aaa1b7e..187dc779 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/service/MusicService.java
@@ -136,5 +136,5 @@ public interface MusicService {
 
 	void createBookmark(String id, int position, Context context, ProgressListener progressListener) throws Exception;
 	
-	MusicDirectory getVideos(Context context, ProgressListener progressListener) throws Exception;
+	MusicDirectory getVideos(boolean refresh, Context context, ProgressListener progressListener) throws Exception;
 }
\ No newline at end of file
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java b/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java
index 307eef19..9e44a86d 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/service/RESTMusicService.java
@@ -1274,7 +1274,7 @@ public class RESTMusicService implements MusicService {
 	}
 
 	@Override
-	public MusicDirectory getVideos(Context context, ProgressListener progressListener) throws Exception {
+	public MusicDirectory getVideos(boolean refresh, Context context, ProgressListener progressListener) throws Exception {
     	checkServerVersion(context, "1.8", "Videos not supported.");
     	
         Reader reader = getReader(context, progressListener, "getVideos", null);