Fix some stuff in the navigation