Toolbar
Merge branch 'jQ-integrate'