update menu, add scan
Merge branch 'quentin'