Align code with grid 5.5.x