Update toolbar code for multiple toolbars (crt. nevf)