Some more changes for mobile