diff --git a/layouts/index.html b/layouts/index.html
index fdc03b1..73c5979 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -3,10 +3,13 @@
 {{end}}
 
 {{define "main"}}
+{{$content := replaceRE `a href="\.\.\/(.+%20.+)+"` `$1` .Content}}
+{{$content = replace $content "%20" "-"}}
+{{$content = $content | safeHTML}}
 <!-- Main Page -->
 <div class="singlePage">
     {{partial "darkmode.html" .}}
-    {{.Content}}
+    {{$content}}
 
     <!-- Contact Info -->
     <div>
diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html
index 16a9f6a..d10c7f5 100644
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@@ -126,7 +126,7 @@
     .attr("fill", color)
     .style("cursor", "pointer")
     .on("click", (_, d) => {
-      window.location.href = {{.Site.BaseURL}} + d.id.replace(" ", "-");
+      window.location.href = {{.Site.BaseURL}} + d.id.replace(" ", "-").replace("%20", "-");
     })
     .on("mouseover", function (_, d) {
       d3.selectAll(".node")
@@ -184,7 +184,7 @@
   const labels = graphNode.append("text")
     .attr("dx", 12)
     .attr("dy", ".35em")
-    .text((d) => d.id.replace("%20", "-"))
+    .text((d) => d.id.replace("%20", " "))
     .style("opacity", 0)
     .style("pointer-events", "none")
     .call(drag(simulation));