changed scope names, fixed up user view form