Added grid and table view