Refactor non-team/project templates into new modal display