Refactored Toolbar