Refactor intro, forms and modify sections into partials