Fixed issues for mobile