Fix to Grid plot sizing issues