Proper contact page and minor cleanup.