Fixed validation and positioning of rows