Navigation now actually works