Small Changes to Grid Class.