Minor template updates and shuffles