Mobile changes

Changes for mobile