Navigation additions and improvements