[NGRINDER-692] Fix the layout