added support for additional toolbar options