refactoring code and add contact page