Scrollable toolbar again
Merge pull request #766 from brooksryba/develop

Scrollable toolbar again