Merge pull request #533 from brooksryba/develop

Develop
Fixed width issue with toolbar windows