Move activate into modal toggle