integrated old changes

When I first added multi speaker support, I put it into an OLD version
of the toolbar. this updates it to include all changes made in 2014.