grid view respecting new datastructure
removed some unused vars