Big redesign of vignettes