refactored and fixed ativate page