Few more template style tweaks