Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -r15b142be62e070649bc68a5b4e3ff4e2022dd88a -r731cf22641a368d8cc2aa4cf3f23322d3f211770
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 15b142be62e070649bc68a5b4e3ff4e2022dd88a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 731cf22641a368d8cc2aa4cf3f23322d3f211770)
@@ -191,7 +191,7 @@
         //Set up Key handler 
         //TODO take out after testing and uncomment same key handler in ready();
         Key.addListener(this);
-		
+		_container_mc.tabChildren = true;
     }
     
     /**
@@ -353,7 +353,7 @@
     */
     private function setupUI(){
 		//Make the base context menu hide built in items so we don't have zoom in etc 
-		_ccm.showCustomCM(_ccm.loadMenu("application"))
+		_ccm.showCustomCM(_ccm.loadMenu("application", "authoring"))
 		
         //Create the application root
         _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH);
@@ -390,8 +390,19 @@
 		
 		_pi_mc = _pi_mc.attachMovie('PropertyInspectorNew','_pi_mc',PI_DEPTH, {_x:PI_X,_y:PI_Y, _canvasModel:_canvas.model, _canvasController:_canvas.view.getController()});
 		_pi_mc.addEventListener('load',Proxy.create(this,UIElementLoaded));
+		
+		setTabIndex();
     }
     
+	private function setTabIndex(selectedTab:String){
+		
+		//All Buttons Tab Index
+		_menu_mc.tabIndex = 100;
+		_toolbarContainer_mc.tabIndex = 200;
+		//_toolkit.tabIndex = 3;
+		_pi_mc.tabIndex = 400;
+	}
+	
     /**
     * Runs when application setup has completed.  At this point the init/loading screen can be removed and the user can
     * work with the application