Fix grid screen to use correct class calls.
Fix the calls to the grid class.