Grid system

Fixed the grid system.