Fix #107 Refactor of gridview class code.