Added the ToolbarWrapper for lazier compile