diff --git a/ui (gen4)/ui.js b/ui (gen4)/ui.js
index 6b3fbe07..d6673be0 100755
--- a/ui (gen4)/ui.js	
+++ b/ui (gen4)/ui.js	
@@ -138,17 +138,17 @@ module.GLOBAL_KEYBOARD = {
 		'#2': 'fitImage: 2',
 		'#3': {
 			default: 'fitImage: 3',
-					 shift: 'fitRibbons: 3',
+			shift: 'fitRibbon: 3.5',
 		},
-		'#4': 'fitFour',
+		'#4': 'fitImage: 4',
 		'#5': {
-			default: 'fitFive',
-			shift: 'fitFiveRibbons',
+			default: 'fitImage: 5',
+			shift: 'fitRibbon: 5.5',
 		},
-		'#6': 'fitSix',
-		'#7': 'fitSeven',
-		'#8':'fitEight',
-		'#9': 'fitNine',
+		'#6': 'fitImage: 6',
+		'#7': 'fitImage: 7',
+		'#8':'fitImage: 8',
+		'#9': 'fitImage: 9',
 		
 		'+': 'zoomIn',
 		'=': '+',
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index 60a16f13..7729544c 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -824,17 +824,6 @@ actions.Actions(Client, {
 			this.ribbons.updateImage('*')
 		}],
 
-	fitTwo: ['Fit two images', function(){ this.fitImage(2) }],
-	fitThree: ['Fit three images', function(){ this.fitImage(3) }],
-	fitFour: ['Fit four images', function(){ this.fitImage(4) }],
-	fitFive: ['Fit five images', function(){ this.fitImage(5) }],
-	fitSix: ['Fit six images', function(){ this.fitImage(6) }],
-	fitSeven: ['Fit seven images', function(){ this.fitImage(7) }],
-	fitEight: ['Fit eight images', function(){ this.fitImage(8) }],
-	fitNine: ['Fit nine images', function(){ this.fitImage(9) }],
-	fitTen: ['Fit ten images', function(){ this.fitImage(10) }],
-	fitEleven: ['Fit eleven images', function(){ this.fitImage(11) }],
-	fitTwelve: ['Fit twelve images', function(){ this.fitImage(12) }],
 
 	fitMax: ['Fit the maximum number of images',
 		function(){ this.fitImage(this.config['max-screen-images']) }],
@@ -857,11 +846,6 @@ actions.Actions(Client, {
 			this.ribbons.updateImage('*')
 		}],
 
-	// XXX is n + 0.5 a good number here???
-	fitThreeRibbons: ['Fit three ribbons vertically', function(){ this.fitRibbon(3.5) }],
-	fitFiveRibbons: ['Fit five ribbons vertically', function(){ this.fitRibbon(5.5) }],
-	fitSevenRibbon: ['Fit seven ribbons vertically', function(){ this.fitRibbon(7.5) }],
-
 
 	// NOTE: these work by getting the target position from .data...
 	shiftImageTo: [