can we separate the toolbar part to another PR?