Navigation fixes and improvements for #3