Minor design changes

Merge request reports