Updates to improve printout headings and listings on client and other pages