Moar GridView bugs fixed