components remove and add working