Updated the main grid with more layout options