modify menu and action keys handling