Refactor templates
Update team index page