configure toolbar
change order of buttons, new buttons
Merge branch 'gvim'