More tweaks for mobile