refactored toolbar