Updated Personas and Roles to share same controller

Edit personas not working, edit roles is. Need to look into that.