Rework done on the annotations part of the timeline

This was done for MapStory, cc @ischneider