Improved toolbar.
Improved toolbar