Fixed navigation

Very hacurate.