Solved some bugs for mobile version