More Section -> Row refactoring