diff --git a/static/css-blue/main.css b/static/css-blue/main.css
index 088044c..8a1be2d 100644
--- a/static/css-blue/main.css
+++ b/static/css-blue/main.css
@@ -2168,7 +2168,7 @@ button,
     -ms-flex-shrink: 0;
     flex-shrink: 0;
     display: block;
-    margin: 0 0 2em 4em;
+    margin: 0 2em 2em 2em;
     width: 50%; }
     #banner .image img {
       height: 100%;
diff --git a/static/css/main.css b/static/css/main.css
index be7ccfb..2a39fa0 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -249,14 +249,19 @@ hr {
     margin: 5em 0; }
 
 .align-left {
-  text-align: left; }
+  float: left;
+  text-align: left;
+  margin-right: 1em; 
+  }
 
 .align-center {
   text-align: center; }
 
 .align-right {
-  text-align: right; }
-
+  float: right;
+  text-align: right;
+  margin-left: 1em; }
+    
 /* Row */
 .row {
   display: flex;
@@ -2168,7 +2173,7 @@ button,
     -ms-flex-shrink: 0;
     flex-shrink: 0;
     display: block;
-    margin: 0 0 2em 4em;
+    margin: 0 2em 2em 2em;
     width: 50%; }
     #banner .image img {
       height: 100%;
diff --git a/templates/article.html b/templates/article.html
index a816624..365c47e 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -135,7 +135,6 @@
       {% endif %}
 
       {% if ARTICLE_FOOTER == true %}
-      <!-- Cornerstone Pages -->
       <section id="article-footer">
           {% include 'include/article_footer.html' %}
       </section>
diff --git a/templates/base.html b/templates/base.html
index 96f5988..79bdedf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -41,8 +41,9 @@
 {% if TAG_FEED_RSS and tag %}
   <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
 {% endif %}
-{% if TRACKING %}
-<!-- This is where you would put the evil javascript cookie based tracking -->
+
+{% if TRACKING == True %}
+{% include 'include/trackingcode.html' %}
 {% endif %}
 
 
@@ -141,5 +142,6 @@
 {{ IMAGETRACKINGCODE }}
 {% endif %}
 
+
 </body>
 </html>
diff --git a/templates/include/cornerstone.html b/templates/include/cornerstone.html
index b7628b7..d84f2f9 100644
--- a/templates/include/cornerstone.html
+++ b/templates/include/cornerstone.html
@@ -26,19 +26,21 @@
             <li><a href="https://jmkengineering.com/power-system-studies/" class="button">Learn More</a></li>
         </ul>
         <br />
-    </article> 
+    </article>  -->
     <article>
         <header> 
             <h2 id="indexheader"><a href="https://jmkengineering.com/solar-design/" rel="bookmark" title="olar Design">Solar Design</a></h2> 
         </header>
         <a href="https://jmkengineering.com/solar-design/" class="image"><img src="images/pv-solar-array.jpg" style="max-width: 100%; display: inline; float: center;" /></a>
-        <div class="entry-content">I need to talk about what we do wrt PC Solar Design</div>
+        <div class="entry-content"><p>This page we will focus on PV solar, however concepts like solar angles, radiation vs irradiation, etc will be helpful regardless of type.</p><p>
+
+            Before getting into the details like off-grid vs grid connected, power draw, VOC, etc; I want to introduce some of the basic concepts starting with solar angles.</p></div>
         <br />
         <ul class="actions">
             <li><a href="https://jmkengineering.com/solar-design/" class="button">Learn More</a></li>
         </ul>
         <br />
-    </article> -->
+    </article>
 
 
 
diff --git a/templates/include/paginated_posts.html b/templates/include/paginated_posts.html
index 996ce0f..1ce1ee8 100644
--- a/templates/include/paginated_posts.html
+++ b/templates/include/paginated_posts.html
@@ -1,14 +1,16 @@
 <div class="posts">
     {% for article in articles_page.object_list %}
     <article>
-        <header> 
-            <h2 id="indexheader"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> 
-        </header>
 
             {% if article.photo_image %}
                 <a href="{{ SITEURL }}/{{ article.url }}" class="image"><img src="{{ SITEURL }}/{{ article.photo_image[1] }}" style="max-width: 100%; display: inline; float: center;" /></a>
             {% endif %}
             {% if (article.category != MICROBLOG ) %}
+            <header> 
+                <h2 id="indexheader"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> 
+            </header>
+            {% endif %}    
+            {% if (article.category != MICROBLOG ) %}
             <div class="entry-content"> {{ article.summary }} </div>
             {% if INCLUDECATEGORY == True %}
             {% if article.category %}
diff --git a/templates/include/trackingcode.html b/templates/include/trackingcode.html
new file mode 100644
index 0000000..9c31277
--- /dev/null
+++ b/templates/include/trackingcode.html
@@ -0,0 +1,20 @@
+<!-- Matomo -->
+<script>
+    var _paq = window._paq = window._paq || [];
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+    _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+    _paq.push(["setCookieDomain", "*.stats.jmkengineering.com"]);
+    _paq.push(["setDomains", ["*.stats.jmkengineering.com"]]);
+    _paq.push(["setDoNotTrack", true]);
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+      var u="//stats.jmkengineering.com/";
+      _paq.push(['setTrackerUrl', u+'matomo.php']);
+      _paq.push(['setSiteId', '1']);
+      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    })();
+  </script>
+  <noscript><p><img src="//stats.jmkengineering.com/matomo.php?idsite=1&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+  <!-- End Matomo Code -->  
\ No newline at end of file