add toolbar
fix tests