Fixed some navigation issues

Signed-off-by: Oscar Suro <outercript@gmail.com>