ECM-4706 UI and effect mistakes on Add/Edit Template form