Role management cleanup
Add a new modal helper
Updates to the Collection class