fixed some issues with toolbar; requires more work...