Improved toolbar/tool implementation.