Add support for multiple buttons in the toolbar