Better mobile integration, some little trick

Fix #579