Issue #53: Toolbar toggles are now updated correcly when a toolbar is closed