Added ability to switch between navigation