Few menu bugs fixed