Roles UI and User-Role related changes