Slightly improved mobile navigation, not quite done yet