fixed scaling with numbers and slider
Merge https://github.com/kjmelon/FBHackathon