changed to gridview, needs tidy up