Refactor in Toolbar