#593 and #594 update reports wireframe with PO feedback