Fix Menu Functionality