Reorganize UI

Closes #3605095

Merge request reports

Loading