Feat/redesign fixes 6

Merge request reports

Loading