moved template pages
renamed some variables