Modified various display text; Taylor did preliminary annotation-type collapsing
Modified various display text; Taylor implemented an initial scheme for collapsing annotation types