Add toolbar type to applicable tools; track which toolbar things came from using ga_value; fix some of the event labels.