Adding Grid 640 layout and changing most of existing table to grid