Add Thank You Page, Contact Us, other fixes