More changes towards a functional gridview