Add, document button-toolbar; general cleanup

Closes #40.
General code cleanup, consistency