Gridview update

Little Messy but operational upgrade to gridview