Changes to menu workflow