In which navigation is made a bit more consistent