Fix with new grid stylesheets