complete rework of display control and formatting