diff --git a/dir-index-uncat.html b/dir-index-uncat.html
index 43990aa688efb929afb516d4b20260a0e9a47c08..87a27ca152e9ab3b54eb82d14f8d84ffdf83fa39 100644
--- a/dir-index-uncat.html
+++ b/dir-index-uncat.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+{{ $root := . }}
 <html>
 <head>
   <meta charset="utf-8" />
@@ -17,59 +18,80 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlo89/56ZQ/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACUjDu1lo89/6mhTP+zrVP/nplD/5+aRK8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHNiIS6Wjz3/ubFY/761W/+vp1D/urRZ/8vDZf/GvmH/nplD/1BNIm8AAAAAAAAAAAAAAAAAAAAAAAAAAJaPPf+knEj/vrVb/761W/++tVv/r6dQ/7q0Wf/Lw2X/y8Nl/8vDZf+tpk7/nplD/wAAAAAAAAAAAAAAAJaPPf+2rVX/vrVb/761W/++tVv/vrVb/6+nUP+6tFn/y8Nl/8vDZf/Lw2X/y8Nl/8G6Xv+emUP/AAAAAAAAAACWjz3/vrVb/761W/++tVv/vrVb/761W/+vp1D/urRZ/8vDZf/Lw2X/y8Nl/8vDZf/Lw2X/nplD/wAAAAAAAAAAlo89/761W/++tVv/vrVb/761W/++tVv/r6dQ/7q0Wf/Lw2X/y8Nl/8vDZf/Lw2X/y8Nl/56ZQ/8AAAAAAAAAAJaPPf++tVv/vrVb/761W/++tVv/vbRa/5aPPf+emUP/y8Nl/8vDZf/Lw2X/y8Nl/8vDZf+emUP/AAAAAAAAAACWjz3/vrVb/761W/++tVv/vrVb/5qTQP+inkb/op5G/6KdRv/Lw2X/y8Nl/8vDZf/Lw2X/nplD/wAAAAAAAAAAlo89/761W/++tVv/sqlS/56ZQ//LxWb/0Mlp/9DJaf/Kw2X/oJtE/7+3XP/Lw2X/y8Nl/56ZQ/8AAAAAAAAAAJaPPf+9tFr/mJE+/7GsUv/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+xrFL/nplD/8vDZf+emUP/AAAAAAAAAACWjz3/op5G/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+inkb/nplD/wAAAAAAAAAAAAAAAKKeRv+3slb/0cpq/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+1sFX/op5G/wAAAAAAAAAAAAAAAAAAAAAAAAAAop5GUKKeRv/Nxmf/0cpq/9HKav/Rymr/0cpq/83GZ/+inkb/op5GSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAop5G16KeRv/LxWb/y8Vm/6KeRv+inkaPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAop5G/6KeRtcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n8AAPgfAADwDwAAwAMAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAwAMAAPAPAAD4HwAA/n8AAA==" />
   <!-- TODO: seed these - maybe like the starter ex or the webui? -->
-  <link rel="stylesheet" href="gw-assets/style.css"/>
+  <link rel="stylesheet" href="/ipfs/Qme2SZFZhhgzT4v3d2R87c8KwaozjyqqUrXPzzA85QbGnj/style.css"/>
   <!-- Icon art is https://fileicons.org/ -->
-  <link rel="stylesheet" href="gw-assets/icons.css">
+  <link rel="stylesheet" href="/ipfs/Qme2SZFZhhgzT4v3d2R87c8KwaozjyqqUrXPzzA85QbGnj/icons.css">
   <title>{{ .Path }}</title>
 </head>
 <body>
-  <div id="header" class="row">
-    <div class="" style="float:left; padding: 0 15px; width: 160px;">
-      <div id="logo" class="ipfs-logo">&nbsp;</div>
-    </div>
-    <div id="header-menu">
-      <div class="header-menu-item"><a href="https://ipfs.io" target="_blank" rel="noopener noreferrer">About IPFS</a></div>
-      <div class="header-menu-item"><a href="https://ipfs.io#install" target="_blank" rel="noopener noreferrer">Install IPFS</a></div>
-      <div class="header-menu-item" id="bug-report">
+  <div id="page-header">
+    <div id="page-header-logo" class="ipfs-logo">&nbsp;</div>
+    <div id="page-header-menu">
+      <div class="menu-item-wide"><a href="https://ipfs.io" target="_blank" rel="noopener noreferrer">About IPFS</a></div>
+      <div class="menu-item-wide"><a href="https://ipfs.io#install" target="_blank" rel="noopener noreferrer">Install IPFS</a></div>
+      <div class="menu-item-narrow"><a href="https://ipfs.io" target="_blank" rel="noopener noreferrer">About</a></div>
+      <div class="menu-item-narrow"><a href="https://ipfs.io#install" target="_blank" rel="noopener noreferrer">Install</a></div>
+      <div>
         <a href="https://github.com/ipfs/dir-index-html/issues/" target="_blank" rel="noopener noreferrer">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18.4 21"><circle cx="7.5" cy="4.8" r="1"/><circle cx="11.1" cy="4.8" r="1"/><path d="M12.7 8.4c-0.5-1.5-1.9-2.5-3.5-2.5 -1.6 0-3 1-3.5 2.5H12.7z"/><path d="M8.5 9.7H5c-0.5 0.8-0.7 1.7-0.7 2.7 0 2.6 1.8 4.8 4.2 5.2V9.7z"/><path d="M13.4 9.7H9.9v7.9c2.4-0.4 4.2-2.5 4.2-5.2C14.1 11.4 13.9 10.5 13.4 9.7z"/><circle cx="15.7" cy="12.9" r="1"/><circle cx="15.1" cy="15.4" r="1"/><circle cx="15.3" cy="10.4" r="1"/><circle cx="2.7" cy="12.9" r="1"/><circle cx="3.3" cy="15.4" r="1"/><circle cx="3.1" cy="10.4" r="1"/></svg>
         </a>
       </div>
     </div>
   </div>
-  <br/>
-  <div class="col-xs-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <strong>Index of {{ .Path }}</strong>
+  <div id="content">
+    <div id="content-header" class="d-flex flex-wrap">
+      <div>
+        <strong>
+          Index of
+          {{ range .Breadcrumbs -}}
+          /{{ if .Path }}<a href="{{ $root.GatewayURL }}{{ .Path | urlEscape }}">{{ .Name }}</a>{{ else }}{{ .Name }}{{ end }}
+          {{- else }}
+          {{ .Path }}
+          {{ end }}
+        </strong>
         {{ if .Hash }}
         <div class="ipfs-hash">
           {{ .Hash }}
         </div>
         {{ end }}
       </div>
-      <table class="table table-striped">
-        <tr>
-          <td class="narrow">
-            <div class="ipfs-icon ipfs-_blank">&nbsp;</div>
-          </td>
-          <td class="padding">
-            <a href="{{.BackLink}}">..</a>
-          </td>
-          <td></td>
-        </tr>
-        {{ range .Listing }}
-        <tr>
-          <td>
-            <div class="ipfs-icon {{iconFromExt .Name}}">&nbsp;</div>
-          </td>
-          <td>
-            <a href="{{ .Path }}">{{ .Name }}</a>
-          </td>
-          <td>{{ .Size }}</td>
-        </tr>
+      {{ if .Size }}
+      <div class="no-linebreak flex-shrink-1 ml-auto">
+        <strong>&nbsp;{{ .Size }}</strong>
+      </div>
+      {{ end }}
+    </div>
+    <div class="table-responsive">
+    <table>
+      <tr>
+        <td class="type-icon">
+          <div class="ipfs-_blank">&nbsp;</div>
+        </td>
+        <td>
+          <a href="{{.BackLink | urlEscape}}">..</a>
+        </td>
+        <td></td>
+        <td></td>
+      </tr>
+      {{ range .Listing }}
+      <tr>
+        <td class="type-icon">
+          <div class="{{iconFromExt .Name}}">&nbsp;</div>
+        </td>
+        <td>
+          <a href="{{ .Path | urlEscape }}">{{ .Name }}</a>
+        </td>
+        <td class="no-linebreak">
+          {{ if .Hash }}
+          <a class="ipfs-hash" href="{{ $root.GatewayURL }}/ipfs/{{ .Hash | urlEscape }}">
+            {{ .ShortHash }}
+          </a>
+          {{ end }}
+        </td>
+        <td class="no-linebreak">{{ .Size }}</td>
+      </tr>
       {{ end }}
-      </table>
+    </table>
     </div>
   </div>
 </body>
diff --git a/gw-assets/style.css b/gw-assets/style.css
index 307b68edec194c294e6fdbb335682f2829ec9469..55786548fb11fee213bece8067113b73eea98dce 100644
--- a/gw-assets/style.css
+++ b/gw-assets/style.css
@@ -1 +1 @@
-body{color:#34373f;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.43;margin:0;word-break:break-all;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}a{color:#117EB3;text-decoration:none}a:hover{color:#00B0E9;text-decoration:underline}a:active,a:visited{color:#00B0E9}strong{font-weight:700}table{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}table:last-child{border-bottom-left-radius:3px;border-bottom-right-radius:3px}tr:first-child td{border-top:0}tr:nth-of-type(even){background-color:#f7f8fa}td{border-top:1px solid #d9dbe2;padding:.65em;vertical-align:top}#page-header{align-items:center;background:#0b3a53;border-bottom:4px solid #69c4cd;color:#fff;display:flex;font-size:1.12em;font-weight:500;justify-content:space-between;padding:0 1em}#page-header a{color:#69c4cd}#page-header a:active{color:#9ad4db}#page-header a:hover{color:#fff}#page-header-logo{height:2.25em;margin:.7em .7em .7em 0;width:7.15em}#page-header-menu{align-items:center;display:flex;margin:.65em 0}#page-header-menu div{margin:0 .6em}#page-header-menu div:last-child{margin:0 0 0 .6em}#page-header-menu svg{fill:#69c4cd;height:1.8em;margin-top:.125em}#page-header-menu svg:hover{fill:#fff}.menu-item-narrow{display:none}#content{border:1px solid #d9dbe2;border-radius:4px;margin:1em}#content-header{background-color:#edf0f4;border-bottom:1px solid #d9dbe2;border-top-left-radius:3px;border-top-right-radius:3px;padding:.7em 1em}.type-icon{width:1.15em}.no-linebreak{white-space:nowrap}.ipfs-hash{color:#7f8491}@media only screen and (max-width:500px){.menu-item-narrow{display:inline}.menu-item-wide{display:none}}@media print{#page-header{display:none}#content-header,.ipfs-hash,body{color:#000}#content-header{border-bottom:1px solid #000}#content{border:1px solid #000}a,a:visited{color:#000;text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}tr{page-break-inside:avoid}tr:nth-of-type(even){background-color:transparent}td{border-top:1px solid #000}}@-ms-viewport{width:device-width}
+body{color:#34373f;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.43;margin:0;word-break:break-all;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}a{color:#117eb3;text-decoration:none}a:hover{color:#00b0e9;text-decoration:underline}a:active,a:visited{color:#00b0e9}strong{font-weight:700}table{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}table:last-child{border-bottom-left-radius:3px;border-bottom-right-radius:3px}tr:first-child td{border-top:0}tr:nth-of-type(even){background-color:#f7f8fa}td{border-top:1px solid #d9dbe2;padding:.65em;vertical-align:top}#page-header{align-items:center;background:#0b3a53;border-bottom:4px solid #69c4cd;color:#fff;display:flex;font-size:1.12em;font-weight:500;justify-content:space-between;padding:0 1em}#page-header a{color:#69c4cd}#page-header a:active{color:#9ad4db}#page-header a:hover{color:#fff}#page-header-logo{height:2.25em;margin:.7em .7em .7em 0;width:7.15em}#page-header-menu{align-items:center;display:flex;margin:.65em 0}#page-header-menu div{margin:0 .6em}#page-header-menu div:last-child{margin:0 0 0 .6em}#page-header-menu svg{fill:#69c4cd;height:1.8em;margin-top:.125em}#page-header-menu svg:hover{fill:#fff}.menu-item-narrow{display:none}#content{border:1px solid #d9dbe2;border-radius:4px;margin:1em}#content-header{background-color:#edf0f4;border-bottom:1px solid #d9dbe2;border-top-left-radius:3px;border-top-right-radius:3px;padding:.7em 1em}.type-icon,.type-icon>*{width:1.15em}.no-linebreak{white-space:nowrap}.ipfs-hash{color:#7f8491;font-family:monospace}@media only screen and (max-width:500px){.menu-item-narrow{display:inline}.menu-item-wide{display:none}}@media print{#page-header{display:none}#content-header,.ipfs-hash,body{color:#000}#content-header{border-bottom:1px solid #000}#content{border:1px solid #000}a,a:visited{color:#000;text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}tr{page-break-inside:avoid}tr:nth-of-type(even){background-color:transparent}td{border-top:1px solid #000}}@-ms-viewport{width:device-width}.d-flex{display:flex}.flex-wrap{flex-flow:wrap}.flex-shrink-1{flex-shrink:1}.ml-auto{margin-left:auto}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
