fixing some bugs on mobile