added toolbars; adapted roles for new api