Ui fixes

Merged Gaëlle Braud requested to merge fix/ui_fixes into master

Merge request reports