Update markup

Winery is now a filter as well, so making it a filter link, and
Descriptor has become Tasting Notes, so making the call for that
instead.
Alignment tweaks

images to the right, and tasting notes to the left