Fixin issue where first child in row was not visible
Refactor