Refactor Toolbar, .find()