Fixing issues and contact form implementation