Revamp the navigation