More layout changes

It still doesn't render the liquors/cocktails/mixer correct, but getting
there.