Tidy up tasting layouts and text