[#864] Few small tweaks to the templates