Added contact form and refactored code