updated all templates to use UI instead FN