rectangle placements done, fix fills