Improve Navigation

And fix bugs.

Signed-off-by: Edward Cheng &lt;c4150221@gmail.com>