Fixed grid sizing and removed commented out code
Move further towards GridView object