Updated templates and labels