Adding some debugging
Fixing a bug with toolbar clicks not updating the original element