Navigation fixes

@andrewgarner