e6855d3125
- Remove dependency on DI - Group translation labels in template variables - Reformat tempate code
- Remove dependency on DI - Group translation labels in template variables - Reformat tempate code