[#2] Few more final tweaks to templates