Adding fields to template and basic formatting