toolbar
better toolbar spacing
manual merge
manual merge