Add contact us form related changes
conflict resolved