some adjust and alert categories tooltab
Merge branch 'vish-b3' of github.com:ging/vish into vish-b3