Improve toolbar