Updated the grid UI and handle null submissions