Improved navigation  on small viewport