Various changes to menu for deployment