updated layout of all drink types