Added view and edit modes to ChoiceField