HDC & Active Commerce tweaks to Glass templates