Updated with toggle for selecting status