Added PONS & updated toolbar to fit Yosemite.