more template tweaks ( #11 )