Fixed b/w menu bugs