Set current menu when use number keypad and other minor tweaks