EventJSON model enrichment
layout adjustments