Further tweaks for mobile