Added conditional menu items