[MOD] Some view improvements and code cleaning

Merge request reports

Loading