Cleaned up the admin code, added users form