More template style tweaks