Also reworked the users portion of the admin area