Fix Keypad Properly