Added support for toggle buttons in toolbar