Cleaning up a bit, added in contact us form functionality