Made layouts for EditChoiceActivity and NewStoryActivity consistant with the others.