Minor UI improvements to the Roles + Permissions page.
Merge origin/master