BZ-10487: BZ-10344: tidy up print views