Refactor into generic event, country dashboards