More modifications for mobile