Make minor fixes to improve navigation, especially for first time users
Merge branch 'Ticket0687'