added support for new toolbar tabs