Fix const char pointers
Tweak menu interface for accessing choices