#74 Refactoring for be compatible with Toolbar bundle