Added keypad support and highlighting of keyed action