Mintel: Cosmetics market improving; drug, mass go-to sources for products