Current extra choices was too Panels dependent
Better default display
Moved extra choice logic to existing hook