Added ChoicePanel
Obliterated default mark of 15 (d'oh)