added tiny toolbar wrapper, refactored out underscore-names