Added separate table for rows