DESIGN: Reorganised sections