Add contact us page
Fix a few bugs