KeyPad improvements