Gridview UI Bug fixes
Gridview UI Bug fixes