Finished up template edit