Improve the toolbar