diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index 78510e0fa..511ecdc28 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -7,11 +7,11 @@
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>324 869 346 44 0 0 1280 1002 </string>
+		<string>235 637 346 44 0 0 1024 746 </string>
 		<key>463</key>
-		<string>464 546 352 268 0 0 1280 1002 </string>
+		<string>336 385 352 268 0 0 1024 746 </string>
 		<key>513</key>
-		<string>184 659 109 106 0 0 1280 1002 </string>
+		<string>143 464 125 137 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>443.0</string>
@@ -28,12 +28,12 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>21</integer>
-		<integer>463</integer>
 		<integer>29</integer>
 		<integer>513</integer>
+		<integer>463</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8H14</string>
+	<string>8I127</string>
 </dict>
 </plist>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 5794108f9..65388a396 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index d47252e1f..0fceddda5 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -410,18 +410,14 @@
 	}		
 }
 */
-/*
 - (BOOL)next
 {
 	PlaylistEntry *pe;
 	
-	pe = [self entryAtOffset:1];
+	pe = [self entryAtIndex:[currentEntry index] + 1];
 	if (pe == nil)
 		return NO;
 	
-	if (shuffle == YES)
-		shuffleIndex++;
-	
 	[self setCurrentEntry:pe];
 	
 	return YES;
@@ -431,18 +427,15 @@
 {
 	PlaylistEntry *pe;
 	
-	pe = [self entryAtOffset:-1];
+	pe = [self entryAtIndex:[currentEntry index] - 1];
 	if (pe == nil)
 		return NO;
-
-	if (shuffle == YES)
-		shuffleIndex--;	
 	
 	[self setCurrentEntry:pe];
 	
 	return YES;
 }
-*/
+
 - (void)addShuffledListToBack
 {
 	NSArray *newList = [Shuffle shuffleList:[self arrangedObjects]];