Fixed the view of affiliations
Merge branch 'AffiliationView'