diff --git a/e-infra_theme/partials/toc.html b/e-infra_theme/partials/_toc.html
similarity index 100%
rename from e-infra_theme/partials/toc.html
rename to e-infra_theme/partials/_toc.html
diff --git a/e-infra_theme/partials/breadcrumbs.html b/e-infra_theme/partials/breadcrumbs.html
index 3a159e2c6856e6e3ec4e30b1d99a85af9b823198..5944a6a8b0628cbd9c2a4a32d4b38e5791509641 100644
--- a/e-infra_theme/partials/breadcrumbs.html
+++ b/e-infra_theme/partials/breadcrumbs.html
@@ -1,8 +1,17 @@
 {% if page %}
+<ul>
+
     {% for parent in page.ancestors|reverse %}
-    <span class="md-header-nav__parent">
-        {{parent.title}} /
+    <!-- <span class="md-header-nav__parent">
+        <a href="{{ parent.url|url }}">{{ parent.title }}</a>
     </span>
+    <span>></span> -->
+    {%- if parent.link %}
+    <li><a href="{{ parent.link|e }}">{{ parent.title }}</a></li>
+    {%- else %}
+    <li>{{ parent.title }}</li>
+    {% endif %}
     {% endfor %}
-{% endif %}
-{{ page.title | default(config.site_name, true) }}
\ No newline at end of file
+    {% endif %}
+    <li>{{ page.title | default(config.site_name, true) }}</li>
+</ul>
\ No newline at end of file
diff --git a/e-infra_theme/partials/copyright.html b/e-infra_theme/partials/copyright.html
index d147e4e22ca8554571f11d4bdd12b940acf81fb6..9abb43c069d0127aef11a55b5f6d1ba042c42b61 100644
--- a/e-infra_theme/partials/copyright.html
+++ b/e-infra_theme/partials/copyright.html
@@ -1,7 +1,7 @@
 <div class="md-copyright">
     {% if config.copyright %}
       <div class="md-copyright__highlight">
-        {{ config.copyright }}
+        {{ config.copyright }} | <a href="https://www.e-infra.cz/en/personal-data-processing" target="_blank">Privacy Policy</a>
         <span style="float: right">
           {{ config.extra.version }} ({{ config.extra.build_date }})
         </span>
diff --git a/e-infra_theme/partials/footer.html b/e-infra_theme/partials/footer.html
index 17a45d8e2f2712b18770895a6b0935f778022b30..0f8173c3d882196feecbef9911a70d3d3926bc7e 100644
--- a/e-infra_theme/partials/footer.html
+++ b/e-infra_theme/partials/footer.html
@@ -1,28 +1,50 @@
 <footer class="md-footer">
     <div class="md-footer__inner md-grid md-footer__grid md-typeset">
         <div class="md-footer__column">
-          <div class="md-footer__heading">General information</div>
-          <div class="md-footer__terms">
-              <a href="/about/about-us/#how-to-read-the-documentation">Reading the documentation</a>
-              <a href="/about/contribute/">Contributor guide</a>
-              <a target="_blank" href="https://www.e-infra.cz/novinky">e-INFRA CZ News</a>
-              <a target="_blank" href="https://www.e-infra.cz/cs/file/8c17a18b8d2d21bade1fe2b4b0efe81c/525/20210408_Podminky_e-INFRA-CZ_EN.pdf">Conditions for access to e-INFRA CZ infrastructure</a>
-              <a target="_blank" href="https://www.e-infra.cz/en/personal-data-processing" >Processing of personal data</a>
-          </div>
+          <div class="md-footer__heading">e-INFRA CZ</div>
+          <span>
+            CERIT-SC, with CESNET and IT4Innovations, are the three e-infrastructures that constitute the national e-INFRA CZ research infrastructure.
+          </span>
         </div>
         <div class="md-footer__column">
-            <div class="md-footer__heading">e-INFRA CZ Support</div>
-            <span>Available from Monday-Friday 9AM-5PM<br />
-            TEL: +420 234 680 222 | GSM: +420 602 252 531 <br />
-            EMAIL: support@e-infra.cz</span>
+          <div class="md-footer__heading">General information</div>
+          <div class="md-footer__terms">
+              <span>
+                <img src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2aWV3Qm94PSIwIDAgMzIwIDUxMiIgd2lkdGg9IjMyMCIgaGVpZ2h0PSI1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGRlZnM+CiAgICA8cmFkaWFsR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGN4PSIxOTEuOTUiIGN5PSIyNTYiIHI9IjEyOC4wMjUiIGlkPSJncmFkaWVudC0wIj4KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdHlsZT0ic3RvcC1jb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAxKSIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiByZ2JhKDIwNCwgMjA0LCAyMDQsIDEpIi8+CiAgICA8L3JhZGlhbEdyYWRpZW50PgogIDwvZGVmcz4KICA8cGF0aCBkPSJNMzEwLjYgMjMzLjRjMTIuNSAxMi41IDEyLjUgMzIuOCAwIDQ1LjNsLTE5MiAxOTJjLTEyLjUgMTIuNS0zMi44IDEyLjUtNDUuMyAwcy0xMi41LTMyLjggMC00NS4zTDI0Mi43IDI1NiA3My40IDg2LjZjLTEyLjUtMTIuNS0xMi41LTMyLjggMC00NS4zczMyLjgtMTIuNSA0NS4zIDBsMTkyIDE5MnoiIHN0eWxlPSJwYWludC1vcmRlcjogZmlsbDsgZmlsbDogdXJsKCNncmFkaWVudC0wKTsiLz4KPC9zdmc+" />
+                <a href="/about/about-us/#how-to-read-the-documentation">Reading the documentation</a>
+              </span>
+              <span>
+                <img src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2aWV3Qm94PSIwIDAgMzIwIDUxMiIgd2lkdGg9IjMyMCIgaGVpZ2h0PSI1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGRlZnM+CiAgICA8cmFkaWFsR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGN4PSIxOTEuOTUiIGN5PSIyNTYiIHI9IjEyOC4wMjUiIGlkPSJncmFkaWVudC0wIj4KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdHlsZT0ic3RvcC1jb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAxKSIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiByZ2JhKDIwNCwgMjA0LCAyMDQsIDEpIi8+CiAgICA8L3JhZGlhbEdyYWRpZW50PgogIDwvZGVmcz4KICA8cGF0aCBkPSJNMzEwLjYgMjMzLjRjMTIuNSAxMi41IDEyLjUgMzIuOCAwIDQ1LjNsLTE5MiAxOTJjLTEyLjUgMTIuNS0zMi44IDEyLjUtNDUuMyAwcy0xMi41LTMyLjggMC00NS4zTDI0Mi43IDI1NiA3My40IDg2LjZjLTEyLjUtMTIuNS0xMi41LTMyLjggMC00NS4zczMyLjgtMTIuNSA0NS4zIDBsMTkyIDE5MnoiIHN0eWxlPSJwYWludC1vcmRlcjogZmlsbDsgZmlsbDogdXJsKCNncmFkaWVudC0wKTsiLz4KPC9zdmc+" />
+                <a href="/about/contribute/">Contributor guide</a>
+              </span>
+              <span>
+                <img src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2aWV3Qm94PSIwIDAgMzIwIDUxMiIgd2lkdGg9IjMyMCIgaGVpZ2h0PSI1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGRlZnM+CiAgICA8cmFkaWFsR3JhZGllbnQgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGN4PSIxOTEuOTUiIGN5PSIyNTYiIHI9IjEyOC4wMjUiIGlkPSJncmFkaWVudC0wIj4KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdHlsZT0ic3RvcC1jb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAxKSIvPgogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0eWxlPSJzdG9wLWNvbG9yOiByZ2JhKDIwNCwgMjA0LCAyMDQsIDEpIi8+CiAgICA8L3JhZGlhbEdyYWRpZW50PgogIDwvZGVmcz4KICA8cGF0aCBkPSJNMzEwLjYgMjMzLjRjMTIuNSAxMi41IDEyLjUgMzIuOCAwIDQ1LjNsLTE5MiAxOTJjLTEyLjUgMTIuNS0zMi44IDEyLjUtNDUuMyAwcy0xMi41LTMyLjggMC00NS4zTDI0Mi43IDI1NiA3My40IDg2LjZjLTEyLjUtMTIuNS0xMi41LTMyLjggMC00NS4zczMyLjgtMTIuNSA0NS4zIDBsMTkyIDE5MnoiIHN0eWxlPSJwYWludC1vcmRlcjogZmlsbDsgZmlsbDogdXJsKCNncmFkaWVudC0wKTsiLz4KPC9zdmc+" />
+                <a target="_blank" href="https://www.e-infra.cz/novinky">e-INFRA CZ News</a>
+              </span>
+            </div>
         </div>
         <div class="md-footer__column">
+          <div class="md-footer__heading">e-INFRA CZ Support</div>
+          <span>
+            <div>
+              <span class="md-icon" style="float: left;width: 15px;margin: 5px 5px 0 0;vertical-align: middle;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M256 0a256 256 0 1 1 0 512A256 256 0 1 1 256 0zM232 120V256c0 8 4 15.5 10.7 20l96 64c11 7.4 25.9 4.4 33.3-6.7s4.4-25.9-6.7-33.3L280 243.2V120c0-13.3-10.7-24-24-24s-24 10.7-24 24z"></path></svg></span>
+              <span>Available non-stop</span>
+            </div>
+            <div>
+              <span class="md-icon" style="float: left;width: 15px;margin: 5px 5px 0 0;vertical-align: middle;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M48 64C21.5 64 0 85.5 0 112c0 15.1 7.1 29.3 19.2 38.4L236.8 313.6c11.4 8.5 27 8.5 38.4 0L492.8 150.4c12.1-9.1 19.2-23.3 19.2-38.4c0-26.5-21.5-48-48-48H48zM0 176V384c0 35.3 28.7 64 64 64H448c35.3 0 64-28.7 64-64V176L294.4 339.2c-22.8 17.1-54 17.1-76.8 0L0 176z"></path></svg></span>
+              <span>support@e-infra.cz</span>
+            </div>
+            <div>
+              <span class="md-icon" style="float: left;width: 15px;margin: 5px 5px 0 0;vertical-align: middle;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M164.9 24.6c-7.7-18.6-28-28.5-47.4-23.2l-88 24C12.1 30.2 0 46 0 64C0 311.4 200.6 512 448 512c18 0 33.8-12.1 38.6-29.5l24-88c5.3-19.4-4.6-39.7-23.2-47.4l-96-40c-16.3-6.8-35.2-2.1-46.3 11.6L304.7 368C234.3 334.7 177.3 277.7 144 207.3L193.3 167c13.7-11.2 18.4-30 11.6-46.3l-40-96z"></path></svg></span>
+              <span>+420 234 680 222</span>
+            </div>
+          </span>
         </div>
     </div>
     <div class="md-footer__organizations">
       <img src="/assets/images/cesnet.png" alt="">
       <img src="/assets/images/cerit.png" alt="">
-      <img src="/assets/images/it4i.png" alt="" style="width: 250px;">
+      <img src="/assets/images/it4i.png" alt="" style="width: 200px;">
     </div>
     <div class="md-footer-meta md-typeset">
       <div class="md-footer-meta__inner md-grid">
diff --git a/main/assets/css/extra.css b/main/assets/css/extra.css
index 03861b612bae2b05879a95ad4f97b4c6cec3d986..8c83a487c589ddf849a1128792dc4889359ec960 100644
--- a/main/assets/css/extra.css
+++ b/main/assets/css/extra.css
@@ -79,230 +79,159 @@ html .md-nav__link[for=__toc]~.md-nav {
 }
 
 .md-nav__icon.md-icon svg {
-    display: inline-block;
-    width: 0.9rem;
-    height: 0.9rem;
-    vertical-align: -0.1rem;}
-/*
-.md-nav__icon.md-icon {
-  float: left;
-  padding-right: .2rem;
-}
-*/
-.md-nav__it4i_link {
-    display: block;
-    transition: color 0.125s;
-    text-overflow: ellipsis;
-    cursor: pointer;
-    overflow: hidden
+  display: inline-block;
+  width: 0.9rem;
+  height: 0.9rem;
+  vertical-align: -0.1rem;
 }
 
 a:not([href*="//"]) {
     /* CSS for internal links */
 }
 
-a[href*="//"]:not( [href*='127.0.0.1'] ):not( [href*='docs.it4i.cz'] ):not( [href*='gitlab.it4i.cz'] ):not( [href*='code.it4i.cz'] ):not( [href*='https://www.it4i.cz'] ):not( [href*='https://e-infra.cz'] ):not( [href*='https://support.it4i.cz'] ):not( [href*='docs.e-infra.cz'] ):not( [href*='gitlab.ics.muni.cz'] ):not( .md-button ):not( a[data-bi-name="contributorprofile"])  {
+a[href*="//"]
+:not( [href*='127.0.0.1'] )
+:not( [href*='docs.it4i.cz'] )
+:not( [href*='gitlab.it4i.cz'] )
+:not( [href*='code.it4i.cz'] )
+:not( [href*='https://www.it4i.cz'] )
+:not( [href*='https://e-infra.cz'] )
+:not( [href*='https://support.it4i.cz'] )
+:not( [href*='docs.e-infra.cz'] )
+:not( [href*='gitlab.ics.muni.cz'] )
+:not( .md-button )
+:not( .md-source )
+:not( a[data-bi-name="contributorprofile"])  {
     background: transparent no-repeat right 0px top 1px;
     background-size: 12px;
     padding: 0px 16px 1px 0px;
     background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'%3E%3C!--! Font Awesome Pro 6.1.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --%3E%3Cpath d='M384 320c-17.67 0-32 14.33-32 32v96H64V160h96c17.67 0 32-14.32 32-32s-14.33-32-32-32L64 96c-35.35 0-64 28.65-64 64V448c0 35.34 28.65 64 64 64h288c35.35 0 64-28.66 64-64v-96C416 334.3 401.7 320 384 320zM488 0H352c-12.94 0-24.62 7.797-29.56 19.75c-4.969 11.97-2.219 25.72 6.938 34.88L370.8 96L169.4 297.4c-12.5 12.5-12.5 32.75 0 45.25C175.6 348.9 183.8 352 192 352s16.38-3.125 22.62-9.375L416 141.3l41.38 41.38c9.156 9.141 22.88 11.84 34.88 6.938C504.2 184.6 512 172.9 512 160V24C512 10.74 501.3 0 488 0z'/%3E%3C/svg%3E");
 }
 
+.md-header__button.md-logo {
+  margin: .2rem .2rem;
+  padding: .4rem .4rem;
+}
 
-.md-nav__it4i_link:after {
-    font-family: Material Icons;
-    font-style: normal;
-    font-variant: normal;
-    font-weight: 400;
-    line-height: 1;
-    text-transform: none;
-    white-space: nowrap;
-    speak: none;
-    word-wrap: normal;
-    direction: ltr
-}
-
-/*
-.md-nav__item--nested>.md-nav__it4i_link:after {
-    content: "keyboard_arrow_down"
-}*/
-
-html .md-nav__it4i_link[for=toc],html .md-nav__it4i_link[for=toc]+.md-nav__it4i_link:after,html .md-nav__it4i_link[for=toc]~.md-nav {
-    display: none;
-}
-
-/*
-.md-nav__it4i_link[data-md-state=blur] {
-    color: rgba(0,0,0,.54)
-}
-*/
-
-.md-nav__it4i_link--active,.md-nav__it4i_link:active {
-    color: #3f51b5
-}
-
-.md-nav__it4i_link:focus,.md-nav__it4i_link:hover {
-    color: #536dfe
-}
-@media only screen and (max-width: 59.9375em) {
-    html .md-nav__it4i_link[for=toc] {
-        display: block;
-        padding-right: 4.8rem
-    }
-
-    html .md-nav__it4i_link[for=toc]:after {
-        color: inherit;
-        content: "toc"
-    }
-
-    html .md-nav__it4i_link[for=toc]+.md-nav__it4i_link {
-        display: none
-    }
-
-    html .md-nav__it4i_link[for=toc]~.md-nav {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex
-    }
-    /*
-    .md-nav--primary .md-nav__item--nested>.md-nav__it4i_link {
-        padding-right: 4.8rem
-    }
-
-    .md-nav--primary .md-nav__item--nested>.md-nav__it4i_link:after {
-        display: none;
-    }*/
-
-    .md-nav--primary .md-nav__it4i_link {
-        position: relative;
-        padding: 1.6rem
-    }
-
-    .md-nav--primary .md-nav__it4i_link:after {
-        position: absolute;
-        top: 50%;
-        right: 1.2rem;
-        margin-top: -1.2rem;
-        color: rgba(0,0,0,.54);
-        font-size: 2.4rem
-    }
-
-    .md-nav--primary .md-nav__it4i_link:focus:after,.md-nav--primary .md-nav__it4i_link:hover:after {
-        color: inherit
-    }
-
-    .md-nav--primary .md-nav--secondary .md-nav .md-nav__it4i_link {
-        padding-left: 2.8rem
-    }
-
-    .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav__it4i_link {
-        padding-left: 4rem
-    }
-
-    .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav__it4i_link {
-        padding-left: 5.2rem
-    }
-
-    .md-nav--primary .md-nav--secondary .md-nav .md-nav .md-nav .md-nav .md-nav__it4i_link {
-        padding-left: 6.4rem
-    }
-}
-@media only screen and (min-width: 76.25em) {
-    .md-nav__item--nested>.md-nav__it4i_link:after {
-        display: inline-block;
-        -webkit-transform-origin: .45em .45em;
-        transform-origin: .45em .45em;
-        -webkit-transform-style: preserve-3d;
-        transform-style: preserve-3d;
-        vertical-align: -.125em
-    }
-
-    .js .md-nav__item--nested>.md-nav__it4i_link:after {
-        -webkit-transition: -webkit-transform .4s;
-        transition: -webkit-transform .4s;
-        transition: transform .4s;
-        transition: transform .4s,-webkit-transform .4s
-    }
-
-    .md-nav__item--nested .md-nav__toggle:checked~.md-nav__it4i_link:after {
-        -webkit-transform: rotateX(180deg);
-        transform: rotateX(180deg)
-    }
+.md-logo > img {
+  height: 1.5rem !important;
+  width: auto !important;
 }
 
-.md-header__button.md-logo {
-    margin: .2rem .2rem;
-    padding: .4rem .4rem;
-  }
-  
-  .md-logo > img {
-    height: 1.5rem !important;
-    width: auto !important;
-  }
+.md-footer {
+  background-color: var(--md-primary-fg-color);
+}
 
-  .md-footer {
-    background-color: var(--md-primary-fg-color);
-  }
+.md-footer a {
+  color: var(--md-primary-fg-color--dark) !important;
+}
 
-  .md-footer a {
-    color: var(--md-primary-fg-color--dark) !important;
-  }
+.md-footer a:active, .md-footer a:focus, .md-footer a:hover {
+  color: var(--md-accent-bg-color--light) !important;
+}
 
-  .md-footer a:active, .md-footer a:focus, .md-footer a:hover {
-    color: var(--md-accent-bg-color--light) !important;
-  }
+.md-footer__grid {
+  display: flex;
+  padding: 20px;
+  font-size: 0.7rem;
+  flex-flow: column
+}
 
-  .md-footer__grid {
-    display: flex
-  }
-  
-  .md-footer__grid {
-    padding: 20px 0;
-    font-size: 0.7rem;
-  }
-  
-  .md-footer__heading {
-    font-size: 1.2rem;
-    font-weight: bold;
-  }
+.md-footer__column {
+  margin: 10px 0;
+}
 
-  .md-footer__organizations {
-    display: flex;
-    justify-content: center;
-    padding: 10px;
-  }
+.md-footer__terms span {
+  display: block;
+}
 
-  .md-footer__organizations > img {
-    display: flex;
-    margin: 0 22px;
-    width: 150px;
-  }
+.md-footer__terms span img {
+  margin: 0px 2px 4px 0px;
+  width: 8px;
+  vertical-align: middle;
+}
 
-  .md-footer__terms > a {
-    display: block;
-  }
+.md-footer__heading {
+  font-size: 0.8rem;
+  font-weight: bold;
+}
 
-  .md-footer .md-copyright {
-    width: 100%
-  }
-  
-  /* .md-nav--lifted > ul > .md-nav__item--nested > label {
-    font-size: 1rem
-  } */
-  
-  .md-breadcrumbs__inner {
-    font-size: 0.55rem;
-  }
+.md-footer__organizations {
+  display: flex;
+  justify-content: center;
+  padding: 10px;
+  background-color: var(--md-default-bg-color--lightest);
+  padding: 20px 10px;
+  flex-flow: column;
+  align-items: center;
+}
+
+.md-footer__organizations > img {
+  display: flex;
+  margin: 0 22px;
+  width: 90px;
+}
+
+.md-footer__terms > a {
+  display: block;
+}
+
+.md-footer .md-copyright {
+  width: 100%
+}
+
+.md-breadcrumbs__inner {
+  font-size: 0.60rem;
+  color: var(--md-default-fg-color--lighter);
+}
+
+.md-breadcrumbs__inner ul {
+  display: flex !important;
+  list-style-type: none;
+  margin: 0 !important;
+  padding-left: 0;
+}
+
+.md-breadcrumbs__inner ul>li:first-of-type {
+  margin-left: 0;
+}
 
-.md-tabs {
-    background: var(--md-default-bg-color);
-    color: var(--md-primary-fg-color);
+.md-breadcrumbs__inner ul li+li:before {
+  background-color: var(--md-default-fg-color--lighter);
+  background-repeat: no-repeat right 0px top 0px;
+  background-size: contain;
+  mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3C!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --%3E%3Cpath d='M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z'/%3E%3C/svg%3E");
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3C!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --%3E%3Cpath d='M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z'/%3E%3C/svg%3E");
+  content: "";
+  margin: 0 4px 0 -12px;
+  width: 0.4rem;
+  height: 0.4rem;
+  display: inline-block;
+  mask-repeat: no-repeat;
+  -webkit-mask-repeat: no-repeat;
 }
 
 .md-tabs__link {
-    padding: 0.5rem;
-    margin-top: 0.6rem;
-    font-weight: 700;
+  font-weight: 700;
+}
+
+@media only screen and (min-width: 59rem) {
+  /* For desktop: */
+  .md-footer__column {
+    margin: 0
+  }
+  .md-footer__grid {
+    flex-flow: row
+  }
+  .md-footer__organizations {
+    padding: 10px;
+    flex-flow: row;
+    align-items: center;
+  }
+  .md-footer__column {
+    margin: 10px auto;
+    max-width: 33%;
+  }
 }
 
 /* Support for MD-TYPESET */
@@ -446,15 +375,14 @@ html .md-nav__it4i_link[for=toc],html .md-nav__it4i_link[for=toc]+.md-nav__it4i_
   color: var(--md-primary-fg-color--light) !important;
 }
 
-/* .md-tabs {
-  background: #000000c2;
-  color: white;
-  padding-bottom: 1em;
-} */
+.md-typeset h1, .md-typeset h2, .md-typeset h3, .md-typeset h4 {
+  font-weight: 700;
+  color: var(--md-primary-fg-color);
+  margin-bottom: 0;
+}
 
-.md-typeset h1, .md-typeset h2 {
-  font-weight: 500;
-  color: var(--md-primary-fg-color) 
+.md-content__button {
+  display: none;
 }
 
 /* .md-header {
diff --git a/main/index.md b/main/index.md
index 3689a1597e087e4e9591cee34591ca139d4b23a0..fad2de4ef19d957853d57078bd04a6396000e5ab 100644
--- a/main/index.md
+++ b/main/index.md
@@ -10,11 +10,7 @@ hide:
 
 The home for documentation of all e-INFRA CZ services that are provided to scientific community in the Czech Republic.
 
-!!! attention "Documentation is getting ready"
-
-    Please note, that the documentation portal is in the early stages of development. Do not use any information from the portal to run mission critical solutions, yet. :-)
-
-# e-INFRA CZ Data Services
+<!-- # e-INFRA CZ Data Services -->
 
 <div class="grid cards" markdown>
 
@@ -26,19 +22,19 @@ The home for documentation of all e-INFRA CZ services that are provided to scien
 
     [:octicons-arrow-right-24: Account creation](./account/creation)   
     [:octicons-arrow-right-24: Accessing your account and services](./account/access)   
-    [:octicons-arrow-right-24: Account management](./account/management/)   
+    [:octicons-arrow-right-24: Account settings](./account/management/)   
     [:octicons-arrow-right-24: Multi-Factor Authentication](./account/mfa/setup)
 <!---  [:octicons-arrow-right-24: Account properties and lifecycle](/account/properties)    
 --->
 
 
--   :fontawesome-solid-microchip:{ .lg .middle } __Data processing__
+-   :fontawesome-solid-microchip:{ .lg .middle } __Data Processing__
 
     ---
 
     Focus on what's important, your research can be accelerated with our **big** servers.
 
-    [:octicons-arrow-right-24: Overview](/compute/)   
+    [:octicons-arrow-right-24: Overview](./compute/)   
     [:octicons-arrow-right-24: Batch computing (Metacentrum Grid)](./compute/grid)   
     [:octicons-arrow-right-24: Compute Cloud (Virtualization)](./compute/openstack/)   
     [:octicons-arrow-right-24: Containers Cloud](./compute/containers/)   
@@ -59,24 +55,6 @@ The home for documentation of all e-INFRA CZ services that are provided to scien
     [:octicons-arrow-right-24: More (data repositories, ...)](./storage/)   
 
 
-</div>
-
-## Other e-INFRA Services
-
-<div class="grid grid-sm" markdown>
-
-Research and Education Networking   
-{ .card }
-
-Multimedia and collaboration   
-{ .card }
-
-Digital identity solution   
-{ .card }
-
-Data Security   
-{ .card }
-
 </div>
 
 [a]: https://www.cesnet.cz/?lang=en
diff --git a/mkdocs.yml b/mkdocs.yml
index cbfcc6d74a56c8522d91d0abfd265ef95b9925a3..420bff25595fca9ea9b62476f7ce26028a19583c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -10,12 +10,12 @@ extra_javascript:
    - assets/js/hotjar.js
 
 # Repository
-repo_name: einfra-docs/documentation
-repo_url: https://gitlab.ics.muni.cz/einfra-docs/documentation/
+repo_name: Docs on GitHub
+repo_url: https://github.com/CESNET/eInfra-docs/
 edit_uri: edit/master/
 
 # Copyright
-copyright: Copyright (c) 2021-2023 e-INFRA CZ Documentation Portal
+copyright: Copyright &copy; 2021-2023 e-INFRA CZ
 
 extra:
   generator: false
@@ -30,21 +30,19 @@ theme:
   custom_dir: e-infra_theme
   language: 'en'
 
-  # 404 page
   static_templates:
     - 404.html
   features:
     - navigation.tabs
-    # https://squidfunk.github.io/mkdocs-material/setup/setting-up-navigation/#section-index-pages
     - navigation.indexes
+    - navigation.instant
+    - navigation.tracking
     - toc.follow
     - navigation.prune
     - content.tooltips
-    #- tabs
-    #- instant
   icon:
     logo: fontawesome/solid/book-open
-    repo: fontawesome/brands/gitlab
+    repo: fontawesome/brands/github
   # Don't include MkDocs' JavaScript
   include_search_page: false
   search_index_only: true
@@ -67,18 +65,10 @@ nav:
   - Managed Data Services: '!include ./topics/managed/mkdocs.yml'
   - General Information: '!include ./topics/about-us/mkdocs.yml'
 
-#extra:
-#  disqus: 'test-3whnesz3gq'
-#  social:
-#    - icon: 'fontawesome/brands/gitlab'
-#      link: 'https://code.it4i.cz/sccs/docs.it4i.cz'
-#    - icon: fontawesome/solid/globe-europe
-#      link: https://www.it4i.cz
-
 plugins:
   - monorepo
   - search:
-      separator: '[\s\.]+'
+      separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)'
       lang:
         - en
   # - git-committers