Updated menu functions