Small toolbar changes

Fixes #51
Probably closes #22