Changes for grid view