CMS toolbar, moved upcoming events into single plugin