UI improvements, Contact Us bug fix