Makes more sense with one toolbar
Naming consistency
Unused features