Contact page and Bug fixes