Bug fixes to the timeline and grouping events into a container.