Improve navigation UX (especially for small devices)