more fixes for mobile
more fixes for mobile