move goal selection page to template
add final summary page