some improvements to the navigation menu for tablets and mobile
merge
fix diverge
fixing merge