Updates and fixes from my side

Mainly contact page