Added state label & remove button function