add margin between numbers and edge of window
remove anti-touch-scrolling
Merge branch 'master' into gh-pages