pull request
Fixing scalebar and some old files