Refactor/view models

Merge request reports

Loading