Merge the agenda

**Note**

There are some integration changes in this merge, as the menu bar changes and this change don't play together nicely