Tidy up user account pages