diff --git a/hugo.yml b/hugo.yml
index 6a54452..6ba0873 100644
--- a/hugo.yml
+++ b/hugo.yml
@@ -1,8 +1,8 @@
 ---
+baseURL: https://gitgitgadget.github.io/
 languageCode: en
 title: GitGitGadget
 relativeURLs: true
-uglyURLs: true
 disableKinds:
 - taxonomy
 markup:
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 62ae931..46fe0c2 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ .Title }}</title>
+    <link rel="canonical" href="{{ .Permalink }}">
     <link rel="icon" href="{{ relURL "favicon.ico" }}">
     {{- $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "main.scss" . | css.Sass }}
     <link rel="stylesheet" href="{{ $style.RelPermalink }}">
diff --git a/layouts/partials/banner.html b/layouts/partials/banner.html
index 2bd84d5..e782be9 100644
--- a/layouts/partials/banner.html
+++ b/layouts/partials/banner.html
@@ -1,5 +1,5 @@
 {{- define "partials/logo.html" -}}
-<img src="images/gitgitgadget-explanation.png"  alt="An arrow from git logo to an envelop with git logo. The arrow is labelled by famous Inspector Gadget hat."/>
+<img src="{{ relURL "images/gitgitgadget-explanation.png" }}"  alt="An arrow from git logo to an envelop with git logo. The arrow is labelled by famous Inspector Gadget hat."/>
 {{- end -}}
 {{- define "partials/subtitle.html" -}}
 <big>GitGitGadget</big><br />
diff --git a/script/graphviz-ssr.js b/script/graphviz-ssr.js
index fdc5f65..5014df0 100755
--- a/script/graphviz-ssr.js
+++ b/script/graphviz-ssr.js
@@ -10,8 +10,8 @@ import Viz from "../static/js/viz-global.js"
  * via `viz-js`.
  */
 ;(async () => {
-  for (const { Path: pathInPublic } of JSON.parse(readFileSync("public/diagram-list.json", "utf-8"))) {
-    const path = `public${pathInPublic}.html`
+  for (const { Path: pathInPublic } of JSON.parse(readFileSync("public/diagram-list/index.json", "utf-8"))) {
+    const path = `public${pathInPublic}/index.html`
     const contents = readFileSync(path, "utf-8")
     const html = parse(contents)
     const vizImport = html.querySelector('script[src$="viz-global.js"]')