[NGRINDER-718] Fix the bug
Fix for better layout