Small fixes to template style