Fix/Improve mobile app support