Cigarettes to come with new labels