ABC formatting and layout changes