Add little legend on vms, and fix config
Merge branch 'test' into dev
Dis