Fei fixed the grid and display