Profile and Contact activities refactoring and cleanups