resolves #11, resolves #13 - clean up on toolbar