Fix style issue on keypad
Change to calculator button layout
Merge branch 'master' into gh-pages