Small updates mainly in templates and variables used in templates