Messy rework of display layout.