Prepare to fix OpenGL warnings
Major shader/grid rework and cleanup