New Features:
- Toolbar fixes

Bugfixes: