Remove debugs
Add button toolbars and groups