Users: edited the user button layout.
Users: replaced deletion code with newer method.