Cleanup, working grid view