Improved toolbar UI