Epoirier/redesign 2021/clean up

Merge request reports