Amends and tweaks to mobile and navigation