Fix menu exploding (so that we don't need the id's anymore)