Merge pull request #764 from Tendrid/develop

Develop
Scrollable toolbar again
WOrkin on the codes
Merge pull request #765 from ahomatthew/develop

WOrkin on the codes
Merge pull request #766 from brooksryba/develop

Scrollable toolbar again
table changes