Merge pull request #535 from brooksryba/develop

Fixed width issue with toolbar windows
Got rid of 100% widths that were causing weird glitches in google chrome. Instead uses a less variable to keep track of the toolbar width