Improved toolbar