Added multiple choice in EditFeatures screen