diff --git a/ui/TODO.otl b/ui/TODO.otl
index 30f95a7e..b7158ded 100755
--- a/ui/TODO.otl
+++ b/ui/TODO.otl
@@ -1,5 +1,5 @@
 Roadmap
-	[_] 59% Pre-Alpha - limited preview
+	[_] 61% Pre-Alpha - limited preview
 		[_] 50% Supported formats
 			[X] jpeg
 			[_] RAW
@@ -9,16 +9,15 @@ Roadmap
 			[_] view unprepared dir (cache in background)
 			| XXX initially lags for hi-res images...
 			[X] view prepared dir
-		[_] 50% UI
+		[_] 57% UI
 			[_] 0% Tablet-specific
 				[_] screen buttons
-			[_] 80% modes
-				[_] cropped mode
-				| show only selected images
+			[X] 100% modes
 				[X] single image
 				[X] slideshow (single image)
 				[X] ribbon
-				[X] single ribbon
+				[X] cropped mode
+				| show only selected images
 			[_] 71% other
 				[X] load/open
 				[X] browse for location (open)
@@ -33,21 +32,19 @@ Roadmap
 			[X] screen next/prev
 			[_] marks next/prev (???)
 		[X] slideshow
-		[_] 55% editing
-			[_] 66% ribbon
+		[_] 71% editing
+			[X] 100% ribbon
 				[X] merge up/down
 				| via. marking... 
 				|
 				| still thinking if this is the right way...
-				[_] flatten
 				[X] sort
-			[_] 81% image
+			[_] 92% image
 				[X] shift up/down
 				[X] shift left/right
 				[X] mark/unmark (selection)
 				[X] rotate left/right
 				[X] flip H/V
-				[_] crop
 				[_] 50% metadata
 					[_] tag
 					[X] note
@@ -60,11 +57,12 @@ Roadmap
 				[_] group
 				[_] note
 				[X] save as set
-			[_] 33% crop selection via
+			[_] 50% crop selection via
 				[X] marked
+				[X] ribbon
 				[_] tag
 				[_] date
-		[_] 60% storage and loading
+		[_] 54% storage and loading
 			[_] 75% ImageGrid cache
 				[X] generate
 				[X] load
@@ -77,10 +75,8 @@ Roadmap
 				[X] save
 				[_] update
 				| at this time images are added to the tree but not removed...
-			[_] 25% xmp files
-				[X] generate
-				| xmpgen + fav tree
-				|
+			[_] 0% xmp files
+				[_] generate
 				| XXX make this native
 				[_] load
 				[_] save
@@ -102,6 +98,11 @@ Roadmap
 			[X] Linux x64 (node-webkit)
 			[_] Windows Phone 8 (PhoneGap/Native)
 	[_] 0% Alpha - limited preview
+		[_] 0% editing
+			[_] 0% ribbon
+				[_] flatten
+			[_] 0% image
+				[_] crop
 	[_] 0% Beta - public?
 	[_] 0% 1.0 - public