Simplified the grid layout