Feature/improve preview display

Merged Sylvain Berfini requested to merge feature/improve_preview_display into master

Merge request reports