diff --git a/content/online-resources/_index.md b/content/online-resources/_index.md
index 455086f..58b4885 100644
--- a/content/online-resources/_index.md
+++ b/content/online-resources/_index.md
@@ -13,7 +13,7 @@ resources_section:
     - title: "Hackathons"
       content: "NWB Hackathon events and information"
       image: "/images/hackathon_icon.png"
-      url: "https://neurodatawithoutborders.github.io/nwb_hackathons/"
+      url: "/events/"
     - title: "NWB Neurodata Extension (NDX) Catalog"
       content: "Discover NWB extensions"
       image: "/images/ndxcatalog_logo_framed.png"
@@ -75,5 +75,5 @@ docs_section:
     - title: "Core Tools"
       content: "Documentation for NWB core tools"
       image: "/images/r-docs.png"
-      url: "https://neurodatawithoutborders.github.io/tools/core/"
+      url: "/tools/core/"
 ---
diff --git a/content/tools/community/nwbview.md b/content/tools/community/nwbview.md
index 8155bc5..5b6e5c8 100644
--- a/content/tools/community/nwbview.md
+++ b/content/tools/community/nwbview.md
@@ -1,7 +1,4 @@
-"/Users/bendichter/dev/neurodatawithoutborders.github.io/layouts/shortcodes/tool-grid.html:29:1": parse failed unexpected EOF Error getting the Hugo object: parse failed unexpected EOF 
-/Users/bendichter/dev/neurodatawithoutborders.github.io/layouts/shortcodes/tool-grid.html:29:1:
-  </div>
-</div>---
+---
 title: "NWBView"
 description: "A cross-platform software with a graphical user interface to display the contents of the binary NWB file format. Written in Rust for high-performance, memory safety and ease of deployment."
 category: "exploration"
diff --git a/hugo.yaml b/hugo.yaml
index a43ec56..df8463b 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -1,4 +1,4 @@
-baseURL: https://neurodatawithoutborders.github.io/
+baseURL: https://nwb.org/
 languageCode: en
 title: Neurodata Without Borders
 
diff --git a/netlify.toml b/netlify.toml
index 3d4d6f4..8f3bb59 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -5,6 +5,15 @@
 [build.environment]
   HUGO_VERSION = "0.152.2"
 
+# Deploy previews and branch deploys are served from their own Netlify URL, so
+# build them with that URL as the Hugo baseURL. Absolute links generated by
+# templates (.Permalink and friends) then stay inside the deploy being viewed.
+[context.deploy-preview]
+  command = 'hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL && npm_config_yes=true npx pagefind --site "public"'
+
+[context.branch-deploy]
+  command = 'hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL && npm_config_yes=true npx pagefind --site "public"'
+
 #[[plugins]]
 #package = 'netlify-plugin-image-optim'