refactor country report view