Overhaul layout and structure.