Make the navigation render more consistently