diff --git a/dumpwiki.py b/dumpwiki.py
index 9fed667..12336cb 100644
--- a/dumpwiki.py
+++ b/dumpwiki.py
@@ -66,15 +66,26 @@ def filenameforlink(href):
     href = urlquote(href)
     return href
 
-def rewritelinks (html):
-    t = html5lib.parseFragment(html, treebuilder = "etree", namespaceHTMLElements = False)
 
-    # remove links to wiki File: pages
-    for a in t.findall(".//a[@class='image']"):  # select img wrapping a
-        href = a.attrib.get('href')
-        if a.findall(".//img") and 'File:' in href:  # ensure a has child: img
-            a.attrib['href'] = 'javascript:void(0);'  # disable href
+def rewriteimglinks(tree, page):
+    # invoke after img src has been rewritten
+    # To: remove links to wiki File on all pages
+    # but Overview_main_page page where link to publication page is added
+    if page.name == 'Overview main page':
+        for div_parent in tree.findall(".//div[@class='tooltip']"):
+            anchor_of_img = div_parent.find(".//div/a")
+            if anchor_of_img.find(".//img") is not None: # <a> needs child <img>
+                a_tag = div_parent.find(".//p/span/a")
+                publication_href = a_tag.attrib.get('href')
+                anchor_of_img.attrib['href'] = publication_href
+    else:
+        for a in tree.findall(".//a[@class='image']"):  # select img wrapping a
+            if a.findall(".//img"):  # ensure a has child: img
+                a.attrib['href'] = 'javascript:void(0);'  # disable href
+    return tree
 
+def rewritelinks(html):
+    t = html5lib.parseFragment(html, treebuilder = "etree", namespaceHTMLElements = False)
     for a in t.findall(".//*[@href]"):
         linkclass = a.attrib.get("class", "")
         href = a.attrib.get("href")
@@ -89,7 +100,7 @@ def rewritelinks (html):
     return html
 
 
-def rewriteimgs(html):
+def rewriteimgs(html, page):
     t = html5lib.parseFragment(html, treebuilder = "etree", namespaceHTMLElements = False)
 
     # replace images url with local image in ../images
@@ -119,6 +130,9 @@ def rewriteimgs(html):
         img.attrib['srcset'] = ""  # rm srcset value:it prevent imgs displaying
         img.attrib['width'] = ""
         img.attrib['height'] = ""
+
+    t = rewriteimglinks(tree=t, page=page)
+
     html = ET.tostring(t, method="html", encoding="unicode")
     return html
 
@@ -126,7 +140,7 @@ def dumppage(p, template, rewrite_images=True):
     htmlsrc = site.parse(page=p.name)['text']['*']
     htmlsrc = rewritelinks(htmlsrc)
     if rewrite_images:
-        htmlsrc = rewriteimgs(htmlsrc)
+        htmlsrc = rewriteimgs(html=htmlsrc, page=p)
     html = template.render(page=p, body=htmlsrc, staticpath='.')
     with open(os.path.join(args.output, filenameforpage(p)), 'w') as f:
         f.write(html)
diff --git a/static/about.css b/static/about.css
index f52b1d4..50782d6 100644
--- a/static/about.css
+++ b/static/about.css
@@ -9,25 +9,36 @@ display: block;
   justify-content: center*/
   color:#371F10;
   margin-left:200px;
-
-
+  margin-bottom: 100px;
 }
 
 .projtext{
-	width: 85%;
+	width: 80%;
 	display: block;
+  text-align: justify;
 
 }
 
 h1{
-	display: block;
-	width:50%;
+  font-size:50px;
+  display: block;
+  width:65%;
+  text-align: left;
+  background-color: transparent;
+  right:auto;
+  position: relative;
+  padding: 0px;
+  top:0%;
+  z-index: 0;
+  margin:0px;
+  margin-top: 50px;
 }
 
 h2{
-	display: block;
-	width:70%;
-	text-align: justify;
+  font-size:23px;
+  display: block;
+  width:65%;
+  text-align: justify;
 }
 
 .pagelink{
diff --git a/static/archive.css b/static/archive.css
index fd416eb..0c99a6b 100644
--- a/static/archive.css
+++ b/static/archive.css
@@ -1,6 +1,59 @@
 body {
     background-color: #aaa4a0;
-    font-family: Arial, Helvetica, sans-serif;
+    color: #371F10;
+    font-family: Roboto Mono, monospace;
+}
+.pagelink{
+  position: fixed;
+  display: inline;
+  left:0px;
+/*  width:20px;
+  height:20px;*/
+  padding: 0px 5px 0px 5px;
+  background-color: white;
+  z-index: 10;
+  font-size: 30px;
+  text-align: center;
+  border-top-style: solid;
+  border-right-style: solid;
+  border-bottom-style: solid;
+  /*border-style: solid;*/
+  border-width: 1px;
+  border-color: #371F10;
+
+}
+
+.pagelink:hover{
+  background-color: #0BEFEB;
+}
+.pagelink a{
+  text-decoration: none;
+}
+
+.pagelink .pagename{
+  display: inline;
+  position: absolute;
+  width: auto;
+  padding: 5px;
+  margin-left: 25px;
+  font-size: 13px;
+  background-color: white;
+  visibility: hidden;
+}
+
+.pagelink:hover .pagename{
+  visibility: visible;
+}
+
+h1 {
+	position: fixed;
+	right:0%;
+	top:5%;
+	text-align: right;
+	background-color: rgba(11,239,235,0.7);
+	padding: 3px 35px 3px 10px;
+	z-index: 10;
+	font-size: 28px;
 }
 
 a, a:visited{
diff --git a/static/index.css b/static/index.css
index 3cea8a2..084402c 100644
--- a/static/index.css
+++ b/static/index.css
@@ -132,7 +132,7 @@ display: inline-block;
   margin-top:-10px;
   /*vertical-align: top;*/
   line-height: 1.3;
-  word-wrap:break-word
+  word-wrap: break-word;
 }
 
 .tooltip:hover .tooltiptext {
@@ -293,3 +293,5 @@ margin-left: 40px;
   height: 2px;
   background-color: #0BEFEB;
 }
+
+a.image {cursor: pointer!important;} /* KEEP THIS: show imgs as link in Overview */
\ No newline at end of file
diff --git a/static/orgs.css b/static/orgs.css
index 7e4b8e1..8110433 100644
--- a/static/orgs.css
+++ b/static/orgs.css
@@ -1,151 +1,115 @@
+
+#top {
+	padding-top: 20px;
+	padding-left: 50px;
+}
+
 body {
 	background-color: #F4EBE8;
 	font-family: Roboto Mono;
-	font-size:11.5px;
-
+	font-size:14px;
 }
 
+/* Page title */
 h1 {
 	position: fixed;
 	right:0%;
-	top:3%;
+	top:5%;
 	text-align: right;
 	background-color: #0BEFEB;
-	padding: 15px 85px 15px 30px;
-	z-index: 10;
-	color: #371F10;
-	font-size: 28px;
-	opacity: 0.7;
-}
-
-/*
-h1 {
-	position: fixed;
-	right:0%;
-	top:3%;
-	text-align: right;
-	background-color: transparent;
-	padding: 10px 30px 30px 20px;
+	padding: 3px 35px 3px 10px;
 	z-index: 10;
 	color: black;
 	font-size: 28px;
-	border: 1px solid blue;
-	border-right: none;
+	opacity: 0.7;
+	color: #371F10;
 }
-*/
 
+/* Organizations list */
 .collapsible{
 	padding-left: 70px;
-	line-height: 0%;
+    line-height: 1;
 	color: #371F10;
 }
 
 .active, .collapsible:hover {
-	color: red;
+	color: blue;
 	cursor: pointer;
 }
 
 .active, .collapsible:after {
 	padding-top: 10px;
-	color: #054646;
 	padding-left: 85px;
+	color: #371F10;
+	font-weight: bold;
 }
 
+/* Droped-down publication links */
 .content {
 	max-height: 0;
    	overflow: hidden;
     transition: max-height 0.2s ease-out;
     padding-left: 50px;
-    background-color: #86a2a2;
+    background-color: #371F10;
     position: relative;
     line-height: 30px;
     margin-left: 85px;
+    color: white;
+    font-size: 14px;
 }
 
-.up {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 15.1%; 
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
+.content a {
+	color:white;
+	text-decoration: none;
 }
 
-.down {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 12.8%; 
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
+.content a:hover {
+	color: blue;
+	cursor: pointer;
 }
 
-.top {
+/* Scroll column */
+.scrollcolumn {
 	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 17.3%;
-	background-color: blue;
+	display: inline;
+	top:35%;
+	right:0%;
+	width: 60px;
+	outline: none;
 	z-index: 10;
-	padding: 10px;
-	border: none; 
+	text-align: center;
 }
 
-.bottom {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 10%;
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
+/* Scroll buttons */
+.scrl {
+	background-color: white;
+	cursor: pointer;
+	border:none;
+	font-size: 15px;
+	margin-top: 10px;
+	height: 60px;
+	width: 60px;
 }
 
-.indexlink {
-	position: fixed;
-	text-decoration: none;
-	font-size: 40px;
-	bottom: 0%;
-	right: 0%;
-	background-color: transparent;
-	border: none;
-	border-right-color: transparent;
-	z-index: 10;
-	padding: 0px 20px 10px 10px;
-	border: none;
+.scrl:hover {
+	background-color: #0BEFEB;
 }
 
-.timeline {
-	position: fixed;
-    font-size: 20px;
-	bottom: 0%;
-	right: 3%;
-	background-color: transparent;
-	border: none;
-	border-right-color: transparent;
+/* Scroll button title */
+.scbt {
+	visibility: hidden;
+	width: 120px;
+	background-color: black;
+	color: #fff;
+	text-align: center;
+	border-radius: 6px;
+	padding: 5px 0;
+	font-size: 15px;
+	right: 50px;
 	z-index: 10;
-	padding: 0px 30px 20px 10px;
-	border: none;
-}
- 
-.timeline a {
-	text-decoration: none;
-}
-
-.indexlink a {
-	text-decoration: none;
+	position: absolute;
 }
 
-#top {
-	padding-top: 42px;
-}
-
-.up:hover, .down:hover, .top:hover, .bottom:hover {
-	cursor: pointer;
-	color: white;
+.scrl:hover > .scbt {
+	visibility: visible;
 }
\ No newline at end of file
diff --git a/static/stats.css b/static/stats.css
new file mode 100644
index 0000000..e69de29
diff --git a/static/title.css b/static/title.css
index 8f4e892..9c816d6 100644
--- a/static/title.css
+++ b/static/title.css
@@ -2,15 +2,16 @@ body {
     background-color: #F4EBE8;
     font-family: Roboto Mono;
 }
+
 .grid-container {
   	display: grid;
   	grid-template-columns: repeat(4, 1fr);
   	grid-gap: 10px;
   	position: absolute;
   	top: 25%;
-	width: 82%;
-	height: auto;
-	right: 8%;
+	  width: 82%;
+	  height: auto;
+	  right: 8%;
   	text-align: : center;
   	z-index: 5;
 
@@ -26,7 +27,6 @@ body {
 	position: relative;
 	max-width: 100%;
 	max-height: 100%;
-
 }
 
 
@@ -53,12 +53,13 @@ h1 {
 	right:0%;
 	top:5%;
 	text-align: right;
-	background-color: #0BEFEB;
+	background-color: rgba(11,239,235,0.7);
 	padding: 3px 35px 3px 10px;
 	z-index: 10;
 	color: black;
-	font-size: 28px;
-	opacity: 0.7;
+	font-size: 27px;
+	color: #371F10;
+  max-width: 90%;
 }
 
 h2{
@@ -66,18 +67,18 @@ h2{
 	right: 0%;
 	top: 15%;
 	text-align: left;
-	background-color: #0BEFEB;
-	/*color: black;*/
+	background-color: rgba(11,239,235,0.7);
 	padding: 3px 35px 3px 10px;
 	z-index: 10;
 	font-size: 20px;
-  	opacity: 0.7;
+  /*	opacity: 0.7;*/
+  	color: #371F10;
 }
 
 .viewnav {
 	position: fixed;
-	bottom:0%;
-	left:0%;
+	bottom: 0%;
+	left: 0%;
 	background-color: transparent;
 	width: 10%;
 	z-index: 10;
@@ -86,7 +87,7 @@ h2{
 
 .collapsible2 {
   	background-color: transparent;
-	color: black;
+	color: red;
 	cursor: pointer;
 	padding: 0px;
 	width: 100%;
@@ -221,23 +222,10 @@ a.content:link {
 	color:white;
 }
 
-/*.metadata_links {
-	display: inline-block;
-	width: 100%;
-	position: absolute;
-	right: 0%;
-	padding: 10px;
-	text-align: left;
-	background-color: blue;
-	font-size: 18px;
-
-}*/
-
 .metadata_organization {
 	font-size: 14px;
 }
 
-
 .fbtn {
 	font-style: italic;
 }
@@ -245,7 +233,7 @@ a.content:link {
 .smw-template-furtherresults {
 	display: none;
 }
-
+/*
 .orglink {
 	position: fixed;
 	top: 30%;
@@ -266,7 +254,7 @@ a.content:link {
   padding: 5px 0;
   font-size: 15px;
 
-  /* Position the tooltip */
+
   position: absolute;
   left: 50px;
   z-index: 10;
@@ -296,7 +284,7 @@ a.content:link {
   padding: 5px 0;
   font-size: 15px;
 
-  /* Position the tooltip */
+
   position: absolute;
   left: 50px;
   z-index: 10;
@@ -326,7 +314,7 @@ a.content:link {
   padding: 5px 0;
   font-size: 15px;
 
-  /* Position the tooltip */
+
   position: absolute;
   left: 50px;
   z-index: 10;
@@ -336,3 +324,4 @@ a.content:link {
   visibility: visible;
 }
 
+*/
\ No newline at end of file
diff --git a/static/topicformat.css b/static/topicformat.css
index 001e902..060f0da 100644
--- a/static/topicformat.css
+++ b/static/topicformat.css
@@ -5,7 +5,6 @@ body {
     padding-right: 120px;
 }
 
-
 .grid-container {
   	display: inline-grid;
   	grid-template-columns: repeat(8, 1fr);
@@ -28,7 +27,6 @@ body {
 	z-index: 5;
 }
 
-
 .img {
   display: inline-block;
   border-style:  hidden  hidden solid hidden;
@@ -38,7 +36,6 @@ body {
 
 .title {
   display:block;
-  font-family: Roboto Mono, monospace;
   font-size: large;
   font-weight: 700;
 }
@@ -48,7 +45,6 @@ body {
   font-weight: normal;
 }
 
-
 .metatext {
   display: inline-block;
   width: 300px;
@@ -56,45 +52,22 @@ body {
   border-style: hidden;
 }
 
-
-.thumbborder {
-	position: relative;
-	max-width: 100%;
-	max-height: 100%;
-
-}
-
-
 /*links*/
 
 a:link {
   text-decoration: none;
-  color: black;
 }
 
 a:visited {
   text-decoration: none;
-  color: black;
 }
-/*
-.metatext:hover a {
-  color: white;
-}
-*/
+
 a:hover {
   background-color: #0BEFEB;
   opacity: 0.7;
   color: white;
-
 }
 
-/*
-.metatext:hover  {
-  background-color: #0BEFEB;
-  color: white;
-
-}
-*/
 h1 {
 	position: fixed;
 	right:0%;
@@ -104,7 +77,6 @@ h1 {
   opacity: 0.5;
 	padding: 3px 30px 3px 10px;
 	z-index: 10;
-	color: white;
 	font-size: 32px;
 }
 
diff --git a/templates/orgs.html b/templates/orgs.html
index c36f762..42ace11 100644
--- a/templates/orgs.html
+++ b/templates/orgs.html
@@ -10,13 +10,15 @@
     <title>{{ page.name }}</title>
 </head>
 <body>
-    <h1>&#9636; &nbsp; {{ page.name }}</h1>
-
-    <button onclick="scrollWin(0,5000)" class="down" title="Down">&#8991;</button>
-    <button onclick="scrollWin(0,-5000)" class="up" title="Up">&#8988;</button>
-    <button onclick="scrollToTop()" class="top" title="Top">&#9140;</button>
-    <button onclick="scrollToBottom()" class="bottom" title="Bottom">&#9141;</button>
+    <h1>{{ page.name }}</h1>
 
+    <div class="scrollcolumn">
+      <button onclick="scrollWin(0,-5000)" class="up scrl">&#8988;<span class="scbt">Up</span></button>
+      <button onclick="scrollWin(0,5000)" class="down scrl">&#8991;<span class="scbt">Down</span></button>
+      <button onclick="scrollToTop()" class="top scrl">&#9140;<span class="scbt">Top</span></button>
+      <button onclick="scrollToBottom()" class="bottom scrl">&#9141;<span class="scbt">Bottom</span></button>
+    </div>
+    
     <div id="body">{{ body|safe }}</div>
       
     <script>
diff --git a/templates/title.html b/templates/title.html
index f21a816..4d489ca 100644
--- a/templates/title.html
+++ b/templates/title.html
@@ -14,11 +14,11 @@
     <h1>{{ page.name }} &#8629;</h1>
 
 <div class="viewnav">
-  <div class="collapsible2 viewbtn">&#8632;</div>
+  <div class="collapsible2 viewbtn">&#10063;</div>
   <div class="content2">
 	<!-- <div class="header" id="myHeader"> -->
-    <p><button class="btn" onclick="myFunction()">100%</button></p>
-    <p><button class="btn" onclick="myFunction2()">overview</button></p>
+    <p><button class="btn" onclick="myFunction()">&#9607;</button></p>
+    <p><button class="btn" onclick="myFunction2()">&#9619;</button></p>
     </div>
   </div> 
 <div>