Refactoring and added numeric keypad with enter button support