add support for short form button keys, restrict wrapper methods to appropriate buttons