- added custom toolbar
- bug fixes