merge UI changes with template changes