diff --git a/images/screenshot-full.jpg b/images/screenshot-full.jpg
new file mode 100644
index 00000000..306ceb40
Binary files /dev/null and b/images/screenshot-full.jpg differ
diff --git a/images/screenshot-full.png b/images/screenshot-full.png
new file mode 100644
index 00000000..721c30a8
Binary files /dev/null and b/images/screenshot-full.png differ
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f8e62798..22ef473a 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,6 +6,7 @@
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <title>{{ block "title" . }}{{ .Title }} - {{ .Site.Title }}{{ end }}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  {{ block "meta_tags" . }}{{end}}
   <link rel="icon" href="{{ .Site.BaseURL }}favicon.png">
 
   {{ if .Site.IsServer }}
diff --git a/layouts/index.html b/layouts/index.html
index 972eadd8..b25bf062 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,8 +1,20 @@
-{{ define "title" }}{{ end}}
+{{ define "title" }}Hugo Hero Theme Demo{{ end}}
 {{ define "header_css" }}{{ end }}
 {{ define "body_classes" }}page-home{{ end }}
 {{ define "header_classes" }}header-transparent{{ end }}
 
+{{ define "meta_tags" }}
+<meta name="description" content="Hero is a multipurpose Hugo theme with fullscreen hero images and fullwidth sections. It contains content types for a business or portfolio site."/>
+<meta property="og:title" content="Hugo Hero Theme" /> 
+<meta property="og:type" content="website" />
+<meta property="og:url" content="https://hugo-hero.netlify.com" />
+<meta property="og:image" content="https://hugo-hero.netlify.com/screenshots/tn.png" />
+<meta property="og:description" content="Hero is a multipurpose Hugo theme with fullscreen hero images and fullwidth sections. It contains content types for a business or portfolio site."/>
+<meta name="twitter:card" content="summary" />
+<meta name="twitter:site" content="@zerostaticio" />
+<meta name="twitter:creator" content="@zerostaticio" />
+{{ end }}
+
 {{ define "main" }}
 
 {{ partial "hero-image-fullscreen.html" (dict "background" "images/jason-blackeye-1191801-unsplash.jpg" "heading" "Hero - Hugo Small Business Theme" "subheading" "Hero is a multipurpose Hugo theme with fullscreen hero images and fullwidth sections. It contains content types for a business or portfolio site."  "content" .)}}
diff --git a/layouts/partials/google-analytics.html b/layouts/partials/google-analytics.html
index e71e5670..63c84abd 100644
--- a/layouts/partials/google-analytics.html
+++ b/layouts/partials/google-analytics.html
@@ -1,24 +1,26 @@
-{{ if eq (getenv "HUGO_ENV") "production" }}
-  {{ if isset (getenv "HUGO_GOOGLE_ANALYTICS_ID") }}
+{{- if .Site.IsServer -}}
+  <!-- Dont add Google analytics to localhost -->
+{{ else }}
+  {{ $gid := (getenv "HUGO_GOOGLE_ANALYTICS_ID") }}
+  {{ if $gid }}
     <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{getenv "HUGO_GOOGLE_ANALYTICS_ID" }}"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{- $gid -}}"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
-    
-      gtag('config', '{{getenv "HUGO_GOOGLE_ANALYTICS_ID" }}');
+      gtag('config', '{{- $gid -}}');
     </script>
   {{ else }}
     {{ if .Site.Params.google_analytics_id }}
       <!-- Global site tag (gtag.js) - Google Analytics -->
-      <script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.Params.google_analytics_id }}"></script>
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{- .Site.Params.google_analytics_id -}}"></script>
       <script>
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
-        gtag('config', '{{ .Site.Params.google_analytics_id }}');
+        gtag('config', '{{- .Site.Params.google_analytics_id -}}');
       </script>
     {{ end }}
   {{ end}}
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/static/.DS_Store b/static/.DS_Store
index b7492542..6ba663c3 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ