Removing template dependency + UI changes