Update admin forms
Update users views
Resolve conflicts with Phil's