diff --git a/pelicanconf.py b/pelicanconf.py
index f2006ba..3b9b95a 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -16,7 +16,7 @@ MENUITEMS = [
     ('Categories', f'{SITEBASE}/categories.html'),
 ]
 LINKS = (
-    ('All My Accounts', 'https://tyrel.dev/links'),
+    ('Find Me', 'https://tyrel.dev/links'),
     ('Book Me', 'https://cal.com/tyrelsouza'),
 )
 
diff --git a/themes/waterspill-en/static/css/style.css b/themes/waterspill-en/static/css/style.css
index 6fd1871..5bd7794 100644
--- a/themes/waterspill-en/static/css/style.css
+++ b/themes/waterspill-en/static/css/style.css
@@ -213,3 +213,13 @@ ol {
     font-size: 1px;
     line-height: 0px;
 }
+
+div.figure img {
+  max-width: 100%;
+}
+
+
+#site-notes {
+  margin-top: 3rem;
+
+}
diff --git a/themes/waterspill-en/templates/archives.html b/themes/waterspill-en/templates/archives.html
index c485aeb..c460e01 100644
--- a/themes/waterspill-en/templates/archives.html
+++ b/themes/waterspill-en/templates/archives.html
@@ -4,13 +4,12 @@
 
 <div class="blogItem">
 <dl>
-						<h2>Archives of {{ SITENAME }}</h2>
-						{% for article in dates %}
-                                                    <dt>{{ article.locale_date }}</dt>
-                                                    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-                                                    
-                                                {% endfor %}
-                                                </dl>
+  <h2>Archives of {{ SITENAME }}</h2>
+  {% for article in dates %}
+    <dt>{{ article.locale_date }}</dt>
+      <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+  {% endfor %}
+</dl>
 
 
 </div>
diff --git a/themes/waterspill-en/templates/article.html b/themes/waterspill-en/templates/article.html
index 5b4856a..5b50c7c 100644
--- a/themes/waterspill-en/templates/article.html
+++ b/themes/waterspill-en/templates/article.html
@@ -9,11 +9,10 @@
       <h3>{{ article.locale_date }}</h3>
       
   {{ article.content }}	
-  {% include 'twitter.html' %}
       
-      <h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
-	{% if article.tags %}<h3 class="blogMeta">Tags: {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
+      <h3 class="blogMeta">{% if not SUPPRESS_ITEM_CATEGORIES %}Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}
+	| {% if article.tags %}Tags: {% for tag in article.tags %}
+    <span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% if not loop.last %} / {% endif %} </span>
 {% endfor %}</h3>{% endif %}
     
     </div><!-- end #blogItem -->
diff --git a/themes/waterspill-en/templates/base.html b/themes/waterspill-en/templates/base.html
index dd7962d..23e44c4 100644
--- a/themes/waterspill-en/templates/base.html
+++ b/themes/waterspill-en/templates/base.html
@@ -61,6 +61,16 @@
 	    </ul>
 	</li>
         {% endif %}
+        {% if LINKS %}
+	<li>
+		<h3>External Links</h3>
+		<ul>
+		{% for name, link in LINKS %}
+      <li><a href="{{ link }}">{{ name }}</a></li>
+    {% endfor %}
+		</ul>
+	</li>
+	{% endif %}
   	{% if not SUPPRESS_CATEGORIES_ON_MENU %}
 	<li>
             <h3>Categories</h3>
@@ -71,16 +81,6 @@
 	    </ul>
 	</li>
         {% endif %}
-        {% if LINKS %}
-	<li>
-		<h3>Blogroll</h3>
-		<ul>
-		{% for name, link in LINKS %}
-                    <li><a href="{{ link }}">{{ name }}</a></li>
-                {% endfor %}
-		</ul>
-	</li>
-	{% endif %}
 	{% if SOCIAL %}
         <li>
                 <h3>Social</h3>
@@ -121,7 +121,6 @@
 
   <div id="footer">
   
-    <p><a href="http://css4free.com/" title="free CSS web site designs">Free CSS Gallery</a></p>
     <p>Proudly powered by <a href="http://getpelican.com">pelican</a>, which takes great advantages of <a href="http://python.org">python</a>.
   </div><!-- end #footer -->
 
diff --git a/themes/waterspill-en/templates/index.html b/themes/waterspill-en/templates/index.html
index 338155a..7f14be6 100644
--- a/themes/waterspill-en/templates/index.html
+++ b/themes/waterspill-en/templates/index.html
@@ -1,46 +1,27 @@
 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
 {% block content %} 
-                        {% if articles %}
-                        {% for article in articles %}        
-                            {% if loop.index == 1 %}
-  	
-    <div class="blogItem">
-    
-      <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-      <h3>{{ article.locale_date }}</h3>
-      
-      {{ article.content }}	
-
-      
-      <h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
-	{% if article.tags %}<h3 class="blogMeta">Tags: {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
-{% endfor %}</h3>{% endif %}
-    
-    </div><!-- end #blogItem -->
- {% if loop.length  > 1 %}	
+  {% if articles %}
+    {% for article in articles %}        
+      {% if loop.index <= 3 %}
         <div class="blogItem">
-                <h2>Other articles</h2>
-        </div>
-{% endif %}
-{% else %}    
-    <div class="blogItem">
-    
-      <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-      <h3>{{ article.locale_date }}</h3>
-      
-      {{ article.summary }}	
-<h3 class="blogMeta">By <a href="#">{{ article.author }}</a>{% if not SUPPRESS_ITEM_CATEGORIES %}, Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}</h3>
-	<a href="{{ SITEURL }}/{{ article.url }}">Continue reading …</a>
-      
-      
-	
-    
-    </div><!-- end #blogItem -->
-  {% endif %}
-{% endfor %}
-{% else %}
-       
+        <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+        <h3>{{ article.locale_date }}</h3>
+        {{ article.content }}	
+        <h3 class="blogMeta">{% if not SUPPRESS_ITEM_CATEGORIES %}Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %} | {% if article.tags %} Tags: {% for tag in article.tags %} <span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% if not loop.last %} / {% endif %} </span> {% endfor %}</h3>{% endif %}</div>
+      {% endif %}
+    {% endfor %}
+
+
+<dl>
+  <h2>Archives of {{ SITENAME }}</h2>
+  {% for article in dates %}
+  {% if loop.index > 3 %}
+    <dt>{{ article.locale_date }}</dt>
+      <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+      {% endif %}
+  {% endfor %}
+</dl>
+
 {% endif %}
 {% endblock content %}
diff --git a/themes/waterspill-en/templates/page.html b/themes/waterspill-en/templates/page.html
index f9a091a..9812e31 100644
--- a/themes/waterspill-en/templates/page.html
+++ b/themes/waterspill-en/templates/page.html
@@ -5,7 +5,6 @@
 <div class="blogItem">
     <h2><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h3>
 	{{ page.content }}
-    {% include 'twitter.html' %}
 
     {% if PDF_PROCESSOR %}<h3 class="blogMeta"><a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
     the pdf</a></h3>{% endif %}