fixed mode switcher
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000