More tweaks and mobile fixes