reduce body padding
fix misordered keys on the keypad
Merge branch 'master' into gh-pages