Navigation Bug Fixes