Updated toolbarwidget, fixed #50