Commit 19: Bug fixes to the Navigation