Add better support for mobile devices