Fixed the highlighting system
Added an (empty) ChoicePanel