Moved, added WahlfachHighlighter to ChoicePanel