Quick reworking of the users section.