clean up gridview implementation slightly
sync