Fixed some bugs on the mobile version