Re-jig the nav