Fixed up contact form and improved buttons