- reorganized the toolbar a little bit