better choice menu
Merge branch 'master' of https://github.com/OpenNingia/st3-codealignment