Improve Grunt engine
Fixes incoherences on small screens