diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js
index a879cd12..10df1381 100755
--- a/ui (gen4)/features/base.js	
+++ b/ui (gen4)/features/base.js	
@@ -564,7 +564,7 @@ actions.Actions({
 			this.images 
 				&& this.images.rotateImage(this.data.getImage(target), direction || 'cw')
 		}],
-	flip: ['- Flip|edit/Flip image',
+	flip: ['- Flip|Edit/Flip image',
 		function(target, direction){
 			if(target == 'vertical' || target == 'horizontal'){
 				direction = target
@@ -588,7 +588,7 @@ actions.Actions({
 
 	// complex operations...
 	// XXX align to ribbon...
-	alignToRibbon: ['Edit/',
+	alignToRibbon: ['Ribbons|Edit/Align top ribbon to base',
 		function(target, start, end){
 			this.data = this.data.alignToRibbon(target, start, end)
 		}],
diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js
index ebf14a0c..3ebfdfa6 100755
--- a/ui (gen4)/features/filesystem.js	
+++ b/ui (gen4)/features/filesystem.js	
@@ -272,6 +272,8 @@ module.Changes = core.ImageGridFeatures.Feature({
 			'reverseImages',
 			'reverseRibbons',
 
+			'alignToRibbon',
+
 			'group',
 			'ungroup',
 			'expandGroup',
diff --git a/ui (gen4)/imagegrid/data.js b/ui (gen4)/imagegrid/data.js
index 9356892e..8caa3bb4 100755
--- a/ui (gen4)/imagegrid/data.js	
+++ b/ui (gen4)/imagegrid/data.js	
@@ -2227,7 +2227,11 @@ var DataPrototype = {
 
 		// split the data into three sections...
 		var res = this.split(start, end)
-		var rest = res.shift()
+		var rest = res.slice(1)
+
+		// cleanup...
+		// XXX do we actually need this???
+		res.forEach(function(e){ e.clear('empty') })
 
 		// set the base ribbon on the middle section...
 		rest[0].setBase(0)