final template fixes