Changes for dashboard and enrichment screen