added support for toolbar