Use a less stacky layout, switch to CheckBox