Fixing contact form bugs