Added support for both keypad and normal arrows