cleaned up menu bugs