[PS-9] :: Add contact section and some minor improvements