Mobile enhancements #80