Fix navigation bug.
Relateds, minor modification.
Neu done.