SubMenu is back, for real this time