Update to inlcude plone.app.toolbar