Refactoring. Removed global toolbarbutton object.