Correct  menu bugs,