diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cbf3a9ad6a7236d35e5ba3478eea7c58460a8e5..14a99849ec8f934340c0fa7973ec824ef2432380 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,17 @@ image: registry.gitlab.com/pages/hugo:latest
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
+
+build-test:
+  before_script:
+  - apk update
+  - apk add git
+  - apk add python3  
+  - apk add py3-pip
+  - apk add py3-yaml
+  script:
+  - hugo --config config.toml -D --destination=./public 
+
 pages:
   before_script:
   - apk update
diff --git a/config-dev.toml b/config-dev.toml
index 27bea8796dda12aeeb3c6275c57ae99bf3074291..4e4466cf44fc8c86350b5549ceab2bad0fc2c40a 100644
--- a/config-dev.toml
+++ b/config-dev.toml
@@ -1,4 +1,4 @@
-baseURL = "http://localhost:1313"
+baseURL = "http://localhost:1313/documentation"
 languageCode = "en-us"
 title = "cloud.muni.cz documentation"
 theme = "hugo-geekdoc"
diff --git a/content/_index.md b/content/_index.md
index a3e3f71816a516b15e32df33af62f38064bb19c4..4e5c6faa7952dd4dfd03f5963dae7ea6845e5a2e 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -2,6 +2,7 @@
 title: "Introduction"
 date: 2021-05-18T11:22:35+02:00
 draft: false
+disableToc: true
 ---
 
 
diff --git a/content/cloud/advanced-features/index.md b/content/cloud/advanced-features/index.md
index 32e413cbead192a0ef78ae89c4dacf83ba0a547d..7867517e7e4b1d84b83eabe62ca275dd121f8fdf 100644
--- a/content/cloud/advanced-features/index.md
+++ b/content/cloud/advanced-features/index.md
@@ -2,6 +2,7 @@
 title: "Advanced Features"
 date: 2021-05-18T11:22:35+02:00
 draft: false
+toc: true
 ---
 
 
diff --git a/content/cloud/news/index.md b/content/cloud/news/index.md
index fd1323b1279e6543118d81a74cc2cabaad5d6ed3..b6b725aae0c95aae6d3287960dbb3f84512ad81f 100644
--- a/content/cloud/news/index.md
+++ b/content/cloud/news/index.md
@@ -2,6 +2,7 @@
 title: "News"
 date: 2021-05-18T11:22:35+02:00
 draft: false
+disableToc: true
 ---
 
 
diff --git a/content/cloud/tools/index.md b/content/cloud/tools/index.md
index 818317689aa0fdf74de4a102c09bce8e5349395a..276e7c333f3a55816e7fd21a89fff6a4d5092c8c 100644
--- a/content/cloud/tools/index.md
+++ b/content/cloud/tools/index.md
@@ -3,6 +3,7 @@ title: "Cloud Tools"
 date: 2021-05-18T11:22:35+02:00
 draft: false
 weight: 100
+disableToc: true
 ---
 
 On this address [https://gitlab.ics.muni.cz/cloud/cloud-tools](https://gitlab.ics.muni.cz/cloud/cloud-tools) you can find a docker container with all modules required for cloud management, if you are interested in managing your cloud platform via CLI. If so, you can check our guide how to use CLI cloud interface [here](/documentation/cloud/cli/).
\ No newline at end of file
diff --git a/content/cloud/windows/index.md b/content/cloud/windows/index.md
index 7218f34ecd4ffc3895dbfe0a69df62605d6449cf..4ba9d79a296728d7825ef1b1b3134bd82c1847d4 100644
--- a/content/cloud/windows/index.md
+++ b/content/cloud/windows/index.md
@@ -2,6 +2,7 @@
 title: "Accessing Windows instance"
 date: 2021-05-18T11:22:35+02:00
 draft: false
+disableToc: true
 ---
 
 
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
new file mode 100644
index 0000000000000000000000000000000000000000..88ddeaaa512cd3a6e8213a592a25120e3d6cbea4
--- /dev/null
+++ b/layouts/partials/content.html
@@ -0,0 +1,12 @@
+{{ if not (.Params.disableToc) }}
+	
+
+<div class="custom-toc-1">
+	<i style="position: relative; left: 3px"> <h3>Table of Contents</h3></i>
+	{{ .TableOfContents }}
+</div>
+
+
+
+{{ end}}
+{{ .Content | replaceRE `<nav id="TableOfContents">\s*<ul>\s*<li>\s*<ul>` `<nav id="TableOfContents"><ul>` | replaceRE `</ul>\s*</li>\s*</ul>\s*</nav>` `</ul></nav>` | safeHTML }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index a8ca6730f42dc2e1b4edf6f217f92f093f7d8fd3..8050b5823f07c58d5363f52cecd5c68d2067acaf 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -6,7 +6,7 @@
         <h2>Navigation</h2>
         <ul class="gdoc-nav__list">
             <li><span class="flex"><strong>Information</strong></span>
-            <ul><span class="flex"><a class="gdoc-nav__entry " href="https://cloud.gitlab-pages.ics.muni.cz/documentation/cloud/news/">News</a></span></ul>
+            <ul><span class="flex"><a class="gdoc-nav__entry " href="/documentation/cloud/news/">News</a></span></ul>
             </li>
         </ul>
     </section>
diff --git a/static/custom.css b/static/custom.css
index c80129260428ce4e00805b919c5a18b661d8cdb7..6f78052cb88d210f02212b63ca2cb94551794f65 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -8,3 +8,9 @@ table.sortable th:not(.sorttable_sorted):not(.sorttable_sorted_reverse):not(.sor
 }
 
 
+.custom-toc-1 {
+ border-left-color:#f2f2f2;
+ background-color:#f2f2f2;
+ color:#f2f2f2
+ border: 3px solid;
+}
\ No newline at end of file