Rework on template and sample content