Minor changes to Grid