Fixed issues in mobile version