move shapesFromRows to table