Navigation fixes

@andrewgarner @aduggin