oo-js toolbar refactor