Updated menu functionality