Fix bugs in navigation

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Fix failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>