Fixes Edit Membership

and adds icons