Adjust labels and templates