Fix map & save sections (but no design)