Fix mobile issues
Fix more mobile issues