Added layout contact page
Conflict merge