Menu/toolbar refactoring, contd.