Menu: Wrap menu items in a <div>

If we decide to make this change, there are lots of places to update.