diff --git a/customizations/Dotawo/assets/css/site.css b/customizations/Dotawo/assets/css/site.css
index b4c1812..52ccedf 100644
--- a/customizations/Dotawo/assets/css/site.css
+++ b/customizations/Dotawo/assets/css/site.css
@@ -317,10 +317,6 @@ ol li {
   list-style-type: decimal;
 }
 
-img {
-  width: 100%;
-}
-
 .supt {
   display: inline-flex;
   flex-wrap: nowrap;
diff --git a/customizations/Dotawo/layouts/_default/_markup/render-image.html b/customizations/Dotawo/layouts/_default/_markup/render-image.html
index bf81236..6e23020 100644
--- a/customizations/Dotawo/layouts/_default/_markup/render-image.html
+++ b/customizations/Dotawo/layouts/_default/_markup/render-image.html
@@ -29,12 +29,12 @@
     {{- $session := $.Page.Site.GetPage (printf "/%s" (replace .Destination ":" "/"))  -}}
     {{ .Page.Scratch.Add "links" (slice $session) }}
     {{- if not $text_link -}}
-      <a href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with $session.Title}} title="{{- $session.Title -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $session.Title -}}</a>
+      <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with $session.Title}} title="{{- $session.Title -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $session.Title -}}</a>
     {{- else -}}
-      <a href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $text_link -}}</a>
+      <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $text_link -}}</a>
     {{- end -}}
   {{- else -}}
-    <a href="{{- .Destination -}}/{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}">{{- $text_link -}}⦚<span>{{- .Destination -}} not found</span></a>
+    <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- .Destination -}}/{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}">{{- $text_link -}}⦚<span>{{- .Destination -}} not found</span></a>
   {{- end -}}
 {{- else if strings.HasPrefix .Destination "audio:" -}}
   {{- $a_destination := (substr .Destination 6) -}}
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 96ebc30..37f740c 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -29,12 +29,12 @@
     {{- $session := $.Page.Site.GetPage (printf "/%s" (replace .Destination ":" "/"))  -}}
     {{ .Page.Scratch.Add "links" (slice $session) }}
     {{- if not $text_link -}}
-      <a href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with $session.Title}} title="{{- $session.Title -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $session.Title -}}</a>
+      <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with $session.Title}} title="{{- $session.Title -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $session.Title -}}</a>
     {{- else -}}
-      <a href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $text_link -}}</a>
+      <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- $session.RelPermalink -}}{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}"{{- with .Title}} title="{{- . -}}"{{- end -}}><span class="sup">{{- index (split .Destination ":") 0 -}}⁄</span>{{- $text_link -}}</a>
     {{- end -}}
   {{- else -}}
-    <a href="{{- .Destination -}}/{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}">{{- $text_link -}}⦚<span>{{- .Destination -}} not found</span></a>
+    <a printhref="#ph-{{- $session.File.UniqueID -}}" href="{{- .Destination -}}/{{- if eq hugo.Environment "offline" -}}index.html{{- end -}}">{{- $text_link -}}⦚<span>{{- .Destination -}} not found</span></a>
   {{- end -}}
 {{- else if strings.HasPrefix .Destination "audio:" -}}
   {{- $a_destination := (substr .Destination 6) -}}
diff --git a/layouts/partials/printsinglebody.html b/layouts/partials/printsinglebody.html
index 007034a..977f14b 100644
--- a/layouts/partials/printsinglebody.html
+++ b/layouts/partials/printsinglebody.html
@@ -8,7 +8,7 @@
 {{ $currentFile := (printf "/%s" .File) }}
 {{ $scratch := $s.Get $currentFile }}
 
-<div id="{{ .File.LogicalName }}" class="{{ $scratch.depth | default "crust" }}title"><span class="supt">{{ substr $currentDir 0 -1 }}⁄</span>{{ .Title }}</div>
+<div id="ph-{{ .File.UniqueID }}" class="{{ $scratch.depth | default "crust" }}title"><span class="supt">{{ substr $currentDir 0 -1 }}⁄</span>{{ .Title }}</div>
 
 <div class="grid">
   <div class="leftcolumn">
@@ -38,7 +38,7 @@
             <div class="afterhas">
         {{ end }}
          <div class="crust">
-           <a href="#{{ .File.LogicalName }}">{{ .Title }}</a>
+           <a href="#ph-{{ .File.UniqueID }}">{{ .Title }}</a>
          </div>
          {{ end }}
       {{ end }}
@@ -62,7 +62,7 @@
               {{ $authors = printf "%s%s" $prefix $authorPage.Title }}
             {{ end }}
             <div class="{{ $scratch.child_depth }} crustoc">
-              <a class="toc" href="#{{ .File.LogicalName }}"><span><span class="back">{{ .Title }} {{with $authors}}({{ $authors }}){{ end }}</span></span></a>
+              <a class="toc" href="#ph-{{ .File.UniqueID }}"><span><span class="back">{{ .Title }} {{with $authors}}({{ $authors }}){{ end }}</span></span></a>
             </div>
           {{ end }}
         </div></div>
diff --git a/layouts/print/single.html b/layouts/print/single.html
index 1468638..eaeac2b 100644
--- a/layouts/print/single.html
+++ b/layouts/print/single.html
@@ -81,9 +81,9 @@
       {{ range $n, $authorFile := .Params.authors }}
         {{ $author := $.GetPage (printf "/author/%s" $authorFile) }}
         {{ if eq $n 0 }}
-          <div class="runningAuthors"><span class="sup">author{{ with (gt $addS 1) }}s{{ end  }}⁄</span><a href="#{{ $author.File.LogicalName  }}">{{ $author.Title }}</a>
+          <div class="runningAuthors"><span class="sup">author{{ with (gt $addS 1) }}s{{ end  }}⁄</span><a href="#ph-{{ $author.File.UniqueID  }}">{{ $author.Title }}</a>
         {{ else }}
-            , <a href="#{{ $author.File.LogicalName  }}">{{ $author.Title }}</a>
+            , <a href="#ph-{{ $author.File.UniqueID  }}">{{ $author.Title }}</a>
         {{ end }}
       {{ end }}
       {{ with .Params.authors }}</div>{{ end }}
@@ -92,7 +92,7 @@
       {{ if gt (len .Title) 54 }}
         {{ $tit = printf "%s…" (substr .Title 0 50) }}
       {{ end  }}
-      <div class="runningTitle"><span class="sup">{{ index $scratch.crust 0 }}⁄</span><a href="#{{ .File.LogicalName }}">{{ $tit }}</a></div>
+      <div class="runningTitle"><span class="sup">{{ index $scratch.crust 0 }}⁄</span><a href="#ph-{{ .File.UniqueID }}">{{ $tit }}</a></div>
       {{ partial "printsinglebody.html" . }}
       {{ .Content }}
       {{ $cssOutput = printf "%s\n%s" $cssOutput (replace $cssTemplate "_rplc_" .File.UniqueID) }}
@@ -107,9 +107,9 @@
           {{ range $n, $authorFile := .Params.authors }}
             {{ $author := $.GetPage (printf "/author/%s" $authorFile) }}
             {{ if eq $n 0 }}
-              <div class="runningAuthors"><span class="sup">author{{ with (gt $addS 1) }}s{{ end  }}⁄</span><a href="#{{ $author.File.LogicalName  }}">{{ $author.Title }}</a>
+              <div class="runningAuthors"><span class="sup">author{{ with (gt $addS 1) }}s{{ end  }}⁄</span><a href="#ph-{{ $author.File.UniqueID  }}">{{ $author.Title }}</a>
             {{ else }}
-                , <a href="#{{ $author.File.LogicalName  }}">{{ $author.Title }}</a>
+                , <a href="#ph-{{ $author.File.UniqueID  }}">{{ $author.Title }}</a>
             {{ end }}
           {{ end }}
           {{ with .Params.authors }}</div>{{ end }}
@@ -118,7 +118,7 @@
           {{ if gt (len .Title) 54 }}
             {{ $tit = printf "%s…" (substr .Title 0 50) }}
           {{ end  }}
-          <div class="runningTitle"><span class="sup">{{ index $scratch.crust 0 }}⁄</span><a href="#{{ .File.LogicalName }}">{{ $tit }}</a></div>
+          <div class="runningTitle"><span class="sup">{{ index $scratch.crust 0 }}⁄</span><a href="#ph-{{ .File.UniqueID }}">{{ $tit }}</a></div>
           {{ partial "printsinglebody.html" . }}
           {{ .Content }}
           {{ $cssOutput = printf "%s\n%s" $cssOutput (replace $cssTemplate "_rplc_" .File.UniqueID) }}
@@ -128,8 +128,8 @@
   
   {{ range where $.Site.RegularPages "Section" "in" (slice "author" "editor") }}
     <div class="authorpage">
-      <div class="runningTitle runningAuthors"><span class="sup">{{ index $scratch.mantle 0 }}⁄</span><a href="#{{ $p.File.LogicalName }}">{{ $p.Title }}</a></div>
-      <div id="{{ .File.LogicalName }}" class="{{ $scratch.depth | default "crust" }}title"><span class="supt">{{ substr .File.Dir 0 -1 }}⁄</span>{{ .Title }}</div>
+      <div class="runningTitle runningAuthors"><span class="sup">{{ index $scratch.mantle 0 }}⁄</span><a href="#ph-{{ $p.File.UniqueID }}">{{ $p.Title }}</a></div>
+      <div id="ph-{{ .File.UniqueID }}" class="{{ $scratch.depth | default "crust" }}title"><span class="supt">{{ substr .File.Dir 0 -1 }}⁄</span>{{ .Title }}</div>
       {{ .Content  }}
 
       {{ if in .Page.Site.Params.sandpointsMentionedIn (substr .File.Dir 0 -1) }}
@@ -141,7 +141,7 @@
           <div class="afterhas">
             {{ range $ss.backlinks }}
               <div class="{{ $ss.child_depth }}">
-                <a href="#{{ .File.LogicalName }}">{{ .Title }}</a>
+                <a href="#ph-{{ .File.UniqueID }}">{{ .Title }}</a>
               </div>
             {{ end }}
           </div></div>
diff --git a/static/css/print.css b/static/css/print.css
index 2abfe41..b969d4c 100644
--- a/static/css/print.css
+++ b/static/css/print.css
@@ -188,10 +188,7 @@
     width: auto;
     break-after: avoid;
     margin-bottom: 0.5rem;
-  }
-
-  img + strong del {
-    margin-left: 0;
+    margin-left: 1rem;
   }
 
   .crustoc {
diff --git a/static/js/pagedjsCustomizations.js b/static/js/pagedjsCustomizations.js
index 0871eef..e494029 100644
--- a/static/js/pagedjsCustomizations.js
+++ b/static/js/pagedjsCustomizations.js
@@ -29,6 +29,10 @@ class Sandpoints extends Paged.Handler {
   beforeParsed(content) {
     var d = {};
     content.querySelectorAll('*').forEach((n, i)=> {
+      if (n.hasAttribute("printhref")) {
+        n.setAttribute("href", n.getAttribute("printhref"))
+      }
+
       if (n.classList.length > 0 ) {
         n.classList.forEach((c, i)=>{
           if (c.startsWith("css-")) {