[NGRINDER-697] Fix layout bug