integrate the toolbar better