[NGRINDER-685] Make the layout better