Replaced ChoiceField with TypedChoiceField where needed
UserCP redesigned for Cranefly