Affiliations ui refactoring