Resolve green menu bugs