Refactored contact form Mk2