New menus hidden behind feature flag

Looks like a bad merge here? I think you accidentally removed this code when merging with master