more toolbar fixes
Merge branch 'nUI' of github.com:ging/vish_editor into nUI