Clean-Up + Fixed Contact us page so it's useful