Updated grid formatting