Merge 127 ui improvements

Merge request reports

Loading