Progressing through toolbar cleanup
Finish hooking up the new toolbar items