toolbar changes

Hey @robert-frampton, <br /><br /> Here is an update for [master](https://issues.liferay.com/browse/master)<br /><br /> Let me know if you have any questions. Thanks!