Integrated the new toolbar code from the editor pod.