some small tpl changes in azure theme

ok, attempt 2, to merge some small azure templates fixes into the right dev branch