Fixing navigation bugs.
Fixing comment bug.