Some mobile-focussed changes
Mobile-centric fixes