Update view and form displays

Merge request reports

Loading