Enahancesments to the grid widget