various style + template updates