Modified UI, added template support