Refactor row/cols props