Rework what is displayable for ATMS, and how to preview [1478]