Updated toolbar