UI-2874  UI and effect mistakes on Add/Edit Template form