diff --git a/index.html b/index.html
index 904a62e..926a832 100755
--- a/index.html
+++ b/index.html
@@ -61,21 +61,17 @@
 
 
 .current-page-indicator {
+	display: none;
 	position: absolute;
 	box-sizing:border-box;
 	opacity: 0.8;
+}
+.editor .current-page-indicator {
+	display: block;
 
 	/*
 	border: solid blue 10px;
 	*/
-
-	/*
-	-webkit-transition: all 0.2s ease;
-	-moz-transition: all 0.2s ease;
-	-o-transition: all 0.2s ease;
-	-ms-transition: all 0.2s ease;
-	transition: all 0.2s ease;
-	*/
 }
 
 </style>
@@ -124,16 +120,7 @@ function clearEditor(){
 	$('.current-page-indicator').children().remove()
 }
 
-var toggleEditor = createCSSClassToggler(
-	'.chrome', 
-	'editor', 
-	function(action){
-		if(action == 'on'){
-			setupEditor()
-		} else {
-			clearEditor()
-		}
-	})
+var toggleEditor = createCSSClassToggler('.chrome', 'editor')
 
 
 $(document).ready(function(){
@@ -235,6 +222,9 @@ $(document).ready(function(){
 	toggleThemes('dark-viewer')
 
 
+	setupEditor()
+
+
 	// hide the splash...
 	setTimeout(function(){
 		$('.splash').fadeOut()
diff --git a/lib/keyboard.js b/lib/keyboard.js
index 58009d9..14c3408 100755
--- a/lib/keyboard.js
+++ b/lib/keyboard.js
@@ -17,9 +17,9 @@ var SPECIAL_KEYS = {
 	13:		'Enter',	34:		'PgDown',	46:		'Del',		
 	16:		'Shift',	35:		'End',		80:		'Backspace',
 	17:		'Ctrl',		36:		'Home',		91:		'Win',		
-	18:		'Alt',		37:		'Right',	93:		'Menu',		
+	18:		'Alt',		37:		'Left',		93:		'Menu',		
 	20:		'Caps Lock',38:		'Up',	 
-	27:		'Esc',		39:		'Left',  
+	27:		'Esc',		39:		'Right',  
 	32:		'Space',	40:		'Down',  
 
 	// Function Keys...