Updated EditChoiceActivity