Added Views + ChoiceButton update