Fixed scale on android device
Some refactoring