diff --git a/ui/Gen3-TODO.otl b/ui/Gen3-TODO.otl
index 660b3a23..f4f673bd 100755
--- a/ui/Gen3-TODO.otl
+++ b/ui/Gen3-TODO.otl
@@ -1,17 +1,19 @@
-[_] 9% Gen 3 current todo
-	[_] 19% High priority
+[_] 16% Gen 3 current todo
+	[_] 33% High priority
+		[_] 0% Undo/Redo
+			[_] push/pop state stack
 		[_] 0% image load and positioning must be fool proof
 		[_] 0% gesture support
-		[_] 0% styles
+		[_] 0% CSS
 			[_] cleanup
 			[_] split themes and layout
+		[X] 100% modes
+			[X] ribbon
+			[X] single-image
 		[_] 0% themes
 			[_] light
 			[_] gray
 			[_] dark
-		[X] 100% action visual indication
-			[X] first/last image
-			[X] shift up/down
 		[_] 0% tweak loader
 			[_] thresholds and frame size
 			[_] remove extra and repetitive actions
@@ -20,6 +22,10 @@
 			[X] indicators
 			[_] image number
 			[_] detailed image info
+		[X] Save/load state
+		[X] 100% action visual indication
+			[X] first/last image
+			[X] shift up/down
 	[_] Low priority
 		[_] Help
 		[_] Keyboard config
diff --git a/ui/base.js b/ui/base.js
index c290d5e5..c9ad784e 100755
--- a/ui/base.js
+++ b/ui/base.js
@@ -640,9 +640,11 @@ function centerRibbons(mode, no_skip_current){
 function clickHandler(evt){
 	var img = $(evt.target).closest('.image')
 
-	centerView(focusImage(img))
+	if(img.filter(NAV_VISIBLE).length > 0){
+		centerView(focusImage(img))
 
-	centerRibbons()
+		centerRibbons()
+	}
 }
 
 
diff --git a/ui/index.html b/ui/index.html
index 8c8aba03..7a0d3fab 100755
--- a/ui/index.html
+++ b/ui/index.html
@@ -263,7 +263,10 @@ body {
 	/* XXX for some reason this breaks the alignment on large magnifications...
 	display: none;
 	*/
+	visibility: hidden;
+	/* XXX this makes images pass through the :visible filter...
 	opacity: 0;
+	*/
 }
 
 
diff --git a/ui/keybindings3.js b/ui/keybindings3.js
index bac46f42..bfa1a102 100755
--- a/ui/keybindings3.js
+++ b/ui/keybindings3.js
@@ -148,6 +148,19 @@ var KEYBOARD_CONFIG = {
 				centerRibbons()
 			},
 
+		S: {
+				ctrl: function(){
+					saveLocalStorage()
+					saveLocalStorageMarks()
+				}
+			},
+		Z: {
+				ctrl: function(){
+					loadLocalStorage()
+					loadLocalStorageMarks()
+				}
+			},
+
 
 		// marking...
 		// XXX not final, think of a better way to do this...