More fixes to make everyone happy and add contact page