Making the navigation more consistent