Menu is now self contained