more template tweaking