Update toolbar id to be less generic