30 improve templating

Merge request reports

Loading