Improve Navigation

Signed-off-by: Edward Cheng <c4150221@gmail.com>

Fix bugs.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
Fix bugs.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
Merge pull request #1129 from WhaleWatching/navigation

Improve Navigation