Updated Choice and Checkbox types layout