Adds contact form and smaller layout optimizations