Added contact and subscription classes plus modifications throughout the site