Improve toolbar functionality