Added contact form and some clean up