Move some templates into views