Improve Navigation

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

Fix bugs.

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