diff --git a/conf/report/history-graph-template.html b/conf/report/history-graph-template.html
index 58e85154c18a9..50ffdfb22de2e 100644
--- a/conf/report/history-graph-template.html
+++ b/conf/report/history-graph-template.html
@@ -2,9 +2,12 @@
 <html>
 <head>
   <script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.0/dist/chart.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="history.css">
 </head>
 
 <body>
+  <button class="button-switcher button-switcher-history" onclick="location='https://chipsalliance.github.io/sv-tests-results/history'"> sv-tests results history </button>
+  <button class="button-switcher" onclick="location='https://chipsalliance.github.io/sv-tests-results/'"> sv-tests results </button>
   <canvas id="line-chart" width=300" height="150"></canvas>
   <script>
 
diff --git a/conf/report/history.css b/conf/report/history.css
new file mode 100644
index 0000000000000..979c52059a33d
--- /dev/null
+++ b/conf/report/history.css
@@ -0,0 +1,17 @@
+.button-switcher {
+  background-color: white;
+  color: black; 
+  border: 2px solid #4CAF60;
+  border-radius: 5px;
+  top: 10px;
+  font-size: auto;
+  float: right;
+  margin:5px;
+}
+
+.button-switcher-history {background-color: #4CAF60; color: white;}
+
+.button-switcher:hover {
+  background-color: #4CAF60;
+  color: white;
+}
diff --git a/conf/report/partials/body-begin.html b/conf/report/partials/body-begin.html
new file mode 100644
index 0000000000000..a20c1c11f6603
--- /dev/null
+++ b/conf/report/partials/body-begin.html
@@ -0,0 +1,5 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+</head>
+<body>
diff --git a/conf/report/partials/body-end.html b/conf/report/partials/body-end.html
new file mode 100644
index 0000000000000..eb72cd3c43ec0
--- /dev/null
+++ b/conf/report/partials/body-end.html
@@ -0,0 +1,4 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+</body>
diff --git a/conf/report/partials/content-begin.html b/conf/report/partials/content-begin.html
new file mode 100644
index 0000000000000..b4212405e4c4a
--- /dev/null
+++ b/conf/report/partials/content-begin.html
@@ -0,0 +1,8 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+<button class="button-switcher" onclick="location='https://chipsalliance.github.io/sv-tests-results/history'"> sv-tests results history </button>
+<button class="button-switcher button-switcher-report" onclick="location='https://chipsalliance.github.io/sv-tests-results/'"> sv-tests results </button>
+<br>
+<h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Tests</a></h1>
+    <p class="headline"><a href="https://github.com/chipsalliance/sv-tests"><em>Test suite to check compliance with the SystemVerilog LRM by chapter as well as some real-world cores and test-cases.</em></a></p>
diff --git a/conf/report/partials/content-end.html b/conf/report/partials/content-end.html
new file mode 100644
index 0000000000000..3dc17f6e53ec8
--- /dev/null
+++ b/conf/report/partials/content-end.html
@@ -0,0 +1,18 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+  <br>
+  <a class="download" href="report.csv">Download a summary in csv</a>
+  
+  <br> <br>
+  <footer id="footer">
+    Generated using <a href="https://github.com/chipsalliance/sv-tests">sv-tests</a>,
+    revision: <a href="https://github.com/chipsalliance/sv-tests/commit/{{revision}}">{{revision}}</a>,
+    {% if build_id != 'local' %}
+      {% set href = 'https://github.com/chipsalliance/sv-tests/actions/runs/' ~ build_id|string %}
+      build_id: <a href="{{href}}">{{build_id}}</a>,
+    {% else %}
+      build_id: <a>{{build_id}}</a>,
+    {% endif %}
+    date: <a>{{datetime}}</a>.
+  </footer>
diff --git a/conf/report/partials/page-begin.html b/conf/report/partials/page-begin.html
new file mode 100644
index 0000000000000..37cb5afe9118e
--- /dev/null
+++ b/conf/report/partials/page-begin.html
@@ -0,0 +1,9 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>{{ title }}</title>
diff --git a/conf/report/partials/page-end.html b/conf/report/partials/page-end.html
new file mode 100644
index 0000000000000..1963dcecfa514
--- /dev/null
+++ b/conf/report/partials/page-end.html
@@ -0,0 +1,4 @@
+{% if False %}
+<!-- vim: set ts=2 sts=2 sw=2 et: -->
+{% endif %}
+</html>
diff --git a/conf/report/report-template.html b/conf/report/report-template.html
index b9fe401813184..7c1ecf17e51ee 100644
--- a/conf/report/report-template.html
+++ b/conf/report/report-template.html
@@ -1,12 +1,9 @@
 {% if False %}
 <!-- vim: set ts=2 sts=2 sw=2 et: -->
 {% endif %}
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <title>SystemVerilog Report</title>
 
+{% include "page-begin.html" %}
+    
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
     <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
@@ -18,9 +15,8 @@
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" rel="stylesheet"/>
     <link rel="stylesheet" type="text/css" href="report.css">
     <script type="text/javascript" charset="utf8" src="report.js"></script>
-  </head>
-
-  <script>
+    
+    <script>
     var table;
     var toolnames = [];
     var tool_array = [];
@@ -371,10 +367,9 @@
       width: calc(80% / {{ report.keys()|length}} );
     }
   </style>
-
-  <body>
-    <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Tests</a></h1>
-    <p class="headline"><a href="https://github.com/chipsalliance/sv-tests"><em>Test suite to check compliance with the SystemVerilog LRM by chapter as well as some real-world cores and test-cases.</em></a></p>
+    {% include 'body-begin.html' %}
+    {% include "content-begin.html" %}
+    
     <button onclick="toggleFilters()">Show advanced filters (experimental)</button>
     <section style="display: none;" id="filter">
       <ul class="filter-entries">
@@ -483,23 +478,10 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
         </tr>
       </tfoot>
     </table>
-    <br>
-    <a class="download" href="report.csv">Download a summary in csv</a>
-  </body>
-
-  <br> <br>
-  <footer id="footer">
-    Generated using <a href="https://github.com/chipsalliance/sv-tests">sv-tests</a>,
-    revision: <a href="https://github.com/chipsalliance/sv-tests/commit/{{revision}}">{{revision}}</a>,
-    {% if build_id != 'local' %}
-      {% set href = 'https://github.com/chipsalliance/sv-tests/actions/runs/' ~ build_id|string %}
-      build_id: <a href="{{href}}">{{build_id}}</a>,
-    {% else %}
-      build_id: <a>{{build_id}}</a>,
-    {% endif %}
-    date: <a>{{datetime}}</a>.
-  </footer>
-
+    
+    {% include 'content-end.html' %}
+    {% include 'body-end.html' %}
+    
   <div id="logfile-outer">
     <div class="iframe-wrap">
       <iframe class="iframe-log" name="log-frame"></iframe>
@@ -540,4 +522,4 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
     {% endfor %}
   </div>
 
-</html>
+{% include 'page-end.html' %}
diff --git a/conf/report/report.css b/conf/report/report.css
index 0786186b231c3..2a063d7c9d086 100644
--- a/conf/report/report.css
+++ b/conf/report/report.css
@@ -263,6 +263,25 @@ button:focus {outline:0;}
   left: 0;
 }
 
+.button-switcher {
+  background-color: white; 
+  color: black; 
+  border: 2px solid #4CAF60;
+  border-radius: 5px;
+  top: 10px;
+  font-size: 20px;
+  position:relative;
+  float: right;
+  margin:5px;
+}
+
+.button-switcher-report {background-color: #4CAF60; color: white;}
+
+.button-switcher:hover {
+  background-color: #4CAF60;
+  color: white;
+}
+
 footer {
   text-align: center;
   font-size: 10px;
diff --git a/tools/sv-report b/tools/sv-report
index 1b390514faefe..6c95f667fff36 100755
--- a/tools/sv-report
+++ b/tools/sv-report
@@ -53,6 +53,11 @@ parser.add_argument(
     help="Path to the html report template",
     default="conf/report/report-template.html")
 
+parser.add_argument(
+    "--partials",
+    help="Directory with report template partials",
+    default="conf/report/partials/")
+
 parser.add_argument(
     "--code-template",
     help="Path to the html code preview template",
@@ -559,8 +564,10 @@ try:
             1 for t in rtt if rtt[t]["status"] not in "test-na")
 
     with open(args.template, "r") as f:
-        report = jinja2.Template(
-            f.read(), trim_blocks=True, lstrip_blocks=True)
+        loader = jinja2.FileSystemLoader(args.partials)
+        report = jinja2.Environment(
+            loader=loader, trim_blocks=True,
+            lstrip_blocks=True).from_string(f.read())
 
     build_id = os.environ.get('GITHUB_RUN_ID', 'local')
     build_datetime = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -571,6 +578,8 @@ try:
                 report=data,
                 database=database,
                 database_urls=urls,
+                #Partials
+                title="SystemVerilog Report",
                 revision=args.revision,
                 build_id=build_id,
                 datetime=build_datetime))
