Worked on navigation, focus
Merge pull request #2 from GarryWest/master

Worked on navigation, focus