change method order, modified menu item actions