incremental rework
refactoring row-controls and span-controls