Moved the keypad around, buttons

Placement of the keypad is now to the right of the textfields.