#593 and #594 update reports UI