Overhaul layouts. Use includes, etc.