toolbar controls refactor