Claudia/toolbar3.4

more refactoring for the toolbar