diff --git a/.gitignore b/.gitignore
index 21439d5b3fd2d302d56c84c6cd61e17fdee3c9a9..43b5357973ac3ab45c4ae195d6ee8672fd8b110b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 eccs.pid
 chromedriver
 python*
+.vscode/settings.json
diff --git a/web/header.php b/web/header.php
index 8436d3485d9e325002420694d9f45cd8bf3823c6..478dbf2aa6655deb7f58ad6f69d8da13ab509132 100644
--- a/web/header.php
+++ b/web/header.php
@@ -16,57 +16,28 @@
                 <div id="core_nav_section" class="et-menu-holder">
                     <ul id="core_nav" class="et-menu et-left">
                         <li class="et-first-option no-children">
-                            <a href="https://technical.edugain.org" title="Home">
+                            <a href="/eccs" title="Home">
                                 <img style="width: 16px; height: 15px; position: relative; top: 3px" src="home_logo.png" alt="Home icon" />
                             </a>
                         </li>
-                        <li class="et-option et-has-children"><span>Members</span>
-                            <ul class="et-submenu">
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/status">Member Federations</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/whatsnew">Recent Changes</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/governance">Assembly</a></li>
-                            </ul>
-                        </li>
-                        <li class="et-option et-has-children"><span>Joining</span>
-                            <ul class="et-submenu">
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/joining_checklist">As Federation</a></li>
-                                <li class="et-submenu-option"><a href="https://wiki.geant.org/display/eduGAIN/How+to+Join+eduGAIN+as+Service+Provider">As Service Provider</a></li>
-                                <li class="et-submenu-option"><a href="https://wiki.geant.org/display/eduGAIN/How+to+set+up+an+Identity+Provider+for+eduGAIN">As Identity Provider</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/metadata">eduGAIN metadata</a></li>
-                            </ul>
+                        &nbsp;
+                        <li class="et-first-option no-children">
+                            <a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Connectivity+Check" title="Instructions">
+                                Instructions
+                            </a>
                         </li>
-                        <li class="et-option et-has-children"><span>Tools</span>
-                            <ul class="et-submenu">
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/validator" target="_blank">Metadata Validator</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/entities">Entities Database</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/isFederatedCheck" target="_blank">isFederated Check</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/eccs" target="_blank">Connectivity Check</a></li>
-                                <li class="et-submenu-option"><a href="https://release-check.edugain.org/" target="_blank">Release Check</a></li>
-                                <li class="et-submenu-option"><a href="https://access-check.edugain.org/" target="_blank">Access Check</a></li>
-                                <li class="et-submenu-option"><a href="https://monitor.edugain.org/coco/" target="_blank">CoCo Check</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/api">Access API</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/monitoring">Monitoring</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/compliance_audit">Profile compliance audit</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/link_tests">Members URL testing</a></li>
-                            </ul>
+                        <li class="et-first-option no-children">
+                            <a href="mailto:support@edugain.org" title="Contacts">
+                                Contacts
+                            </a>
                         </li>
-                        <li class="et-option no-children"><a href="https://technical.edugain.org/documents">Policy framework</a></li>
-                        <li class="et-option et-has-children"><span>Operations</span>
-                            <ul class="et-submenu">
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/issues">Current issues</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/operations">Operational documentation</a></li>
-                                <li class="et-submenu-option"><a href="https://technical.edugain.org/metadata">eduGAIN metadata</a></li>
-                                <li class="et-submenu-option"><a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Services+Status">System status</a></li>
-                            </ul>
-                        <li class="et-option no-children"><a href="https://technical.edugain.org/contact">Support</a></li>
                     </ul>
                 </div>
                 <div id="help_nav_section" class="et-menu-holder">
                     <ul class="et-menu et-right">
-                        <li class="et-option no-children"><a href="https://wiki.edugain.org/">Wiki</a></li>
-                        <li class="et-option no-children"><a href="https://edugain.org">Main webpage</a></li>
+                        <li class="et-option no-children"><a href="https://wiki.geant.org/display/eduGAIN/">eduGAIN Wiki</a></li>
+                        <li class="et-option no-children"><a href="https://edugain.org">eduGAIN Site</a></li>
                     </ul>
                 </div>
             </div> <!-- END central-section -->
-        </nav>
-        <div id="breadcrumb" class="central-section">Tools &gt; eduGAIN Connectivity Check Service</div>
+        </nav>
\ No newline at end of file
diff --git a/web/index.php b/web/index.php
index 2217919e2c8d384e608686ece1d6038ee9751a2c..4e34ab10686b6eb218a87d07f39bc83f41407271 100644
--- a/web/index.php
+++ b/web/index.php
@@ -69,7 +69,7 @@ $data[ 'check_result' ] = htmlspecialchars($_GET[ "check_result" ] ?? null);
        <!-- eduGAIN Header END -->
        <div id="main_body">
          <div class="eccs-central">
-           <h1><a href="/eccs" target="_self">eduGAIN Connectivity Check Service</a> (<a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Connectivity+Check">Instructions</a>, <a href="mailto:support@edugain.org">Contacts</a>)</h1>
+           <h1>eduGAIN Connectivity Check Service</h1>
            <p>The purpose of the eduGAIN Connectivity Check is to identify eduGAIN Identity Providers (IdP) that does not properly consume eduGAIN SAML2 SP metadata.</p>
            <div id="status">
               <hr>
@@ -88,7 +88,6 @@ $data[ 'check_result' ] = htmlspecialchars($_GET[ "check_result" ] ?? null);
                  <div class="boxCalendar">
                     <div id="calendarGo">
                        <button id="goButton" onclick="getPastResults()">Go</button>
-                       <button id="statisticsButton">Statistics</button>
                        <label id="lbl-datepicker" for="datepicker" class="strong">Select date:</label>
                        <input type="text" id="datepicker" />
                     </div> <!-- END calendarGo -->