Add sections. Refine design/