Small fixes
Fixed unused AND buggy scaling
Merge pull request #85 from Elao/develop

No more "Arrow bug" on screen resize \o/