Menu: Wrap menu items in a <div>

Seems like a better check would be to use the new class, since this doesn't explicitly tell us that what has focus is a menu item.