[NGRINDER-698] Fix layout