created UserWrapper and updated other wrappers
cleanup in controller