some styling
contact page in place
resolved conflicts