Fix activation checkbox; refactoring;