Added task edit users screen
Added more client data; added some authz data for admin users and non-admin users
Added missing data prep
Small comment fix