Beautified the ROLES management