Squashed menu bugs, huzzah!