Added State to table and Edit screen