Mobile mode fixes #2