More changes to the template, more to come