Improve toolbar. Fix #131