Improved functionality for mobile