some template tweaks