CMSPageBundle: Toolbar WIP changes.