Project activity refactoring and listeners improvements