Add affiliation option and improve title display