updated all to new teamplte, need to fix link flows