Slightly improved the toolbar