better menu generation
Merge branch 'dr'