Updated toggle and remove functionality