Layout of contact page and minor fixes