Change Table to Grid

Change-Id: Id73fd880729461db6496b4236b276a22834cc893