moved modal tpls into modals