Fix style issue on keypad
Change to calculator button layout