added deactivate modal and controls