first-row, second-row sections refactoring