Updated grid for a better Chrome support