- UserManager cleanups
- View cleanups
- tests