Contact Us form works + some other minor fixes