Improved mobile compatibility