Finish contact page and refactored