toolbar
toolbar more refactoring
Merge pull request #102 from vladpupaza/claudia/toolbar3.4

Claudia/toolbar3.4