tidy up and fix gridview