Navigation Bug Fixes
files