Bug 1071238 - Add ability to put a widget in the toolbar

Also fixed up some white space/indentation and removed a trailing comma