ECMS-4340: Relooking on Manage Templates