Added minor changes to GridView