Template Refactoring and Add contact page stub