Fix toggle button. Add ToolBar visible classes.
Fix some test issues.