Changes to nav and added fields to User