Google integration update, and some removal of common HTML to template snippet files