diff --git a/gulp.d/tasks/build-preview-pages.js b/gulp.d/tasks/build-preview-pages.js
index fb36d1f..23cfdca 100644
--- a/gulp.d/tasks/build-preview-pages.js
+++ b/gulp.d/tasks/build-preview-pages.js
@@ -59,6 +59,10 @@ module.exports = (src, previewSrc, previewDest, sink = () => map()) => (done) =>
               uiModel.page.layout = doc.getAttribute('page-layout', 'default')
               uiModel.page.title = doc.getDocumentTitle()
               uiModel.page.contents = Buffer.from(doc.convert())
+              
+              // Set a meaningful editUrl for preview pages that points to the actual GitHub repo
+              const relativePath = path.relative(previewSrc, file.path)
+              uiModel.page.editUrl = `https://github.com/microprofile/microprofile-tutorial-ui/edit/main/preview-src/${relativePath}`
             }
             file.extname = '.html'
             try {
diff --git a/preview-src/ui-model.yml b/preview-src/ui-model.yml
index e684bce..34b433f 100644
--- a/preview-src/ui-model.yml
+++ b/preview-src/ui-model.yml
@@ -63,7 +63,7 @@ page:
   displayVersion: '5.2'
   module: ROOT
   relativeSrcPath: index.adoc
-  editUrl: http://example.com/project-xyz/blob/main/index.adoc
+  editUrl: https://github.com/microprofile/microprofile-tutorial-ui/edit/main/preview-src/index.adoc
   origin:
     private: false
   previous:
diff --git a/src/css/breadcrumbs.css b/src/css/breadcrumbs.css
index 3ccf6d4..557ee01 100644
--- a/src/css/breadcrumbs.css
+++ b/src/css/breadcrumbs.css
@@ -3,6 +3,8 @@
   flex: 1 1;
   padding: 0 0.5rem 0 0.75rem;
   line-height: var(--nav-line-height);
+  font-family: var(--body-font-family);
+  font-weight: normal;
 }
 
 @media screen and (min-width: 1024px) {
diff --git a/src/css/header.css b/src/css/header.css
index f12bb32..321f3d0 100644
--- a/src/css/header.css
+++ b/src/css/header.css
@@ -37,6 +37,8 @@ body {
   font-size: calc(22 / var(--rem-base) * 1rem);
   flex-wrap: wrap;
   line-height: 1;
+  font-family: var(--heading-font-family);
+  font-weight: normal;
 }
 
 .navbar-brand .navbar-item:first-child a {
diff --git a/src/css/nav.css b/src/css/nav.css
index d29e948..c50bfde 100644
--- a/src/css/nav.css
+++ b/src/css/nav.css
@@ -182,6 +182,8 @@ html.is-clipped--nav {
   justify-content: space-between;
   line-height: 1;
   height: var(--drawer-height);
+  font-family: var(--heading-font-family);
+  font-weight: normal;
 }
 
 .nav-panel-explore:not(:first-child) .context {
diff --git a/src/css/page-versions.css b/src/css/page-versions.css
index 071df88..a8b6c63 100644
--- a/src/css/page-versions.css
+++ b/src/css/page-versions.css
@@ -22,6 +22,8 @@
   padding: 0.5rem 1.5rem 0.5rem 0.5rem;
   position: relative;
   z-index: var(--z-index-page-version-menu);
+  font-family: var(--heading-font-family);
+  font-weight: normal;
 }
 
 .page-versions .version-menu {
diff --git a/src/css/site.css b/src/css/site.css
index 8d0f4ab..fe7d3ab 100644
--- a/src/css/site.css
+++ b/src/css/site.css
@@ -1,4 +1,4 @@
-@import 'typeface-open-sans.css';
+@import 'typeface-lato.css';
 @import 'typeface-roboto-mono.css';
 @import 'vars.css';
 @import 'base.css';
diff --git a/src/css/toc.css b/src/css/toc.css
index 0c6ef7e..da02b0f 100644
--- a/src/css/toc.css
+++ b/src/css/toc.css
@@ -15,6 +15,7 @@
   line-height: 1.3;
   margin: 0 -1px;
   padding-bottom: 0.25rem;
+  font-family: var(--heading-font-family);
 }
 
 .toc.sidebar .toc-menu h3 {
diff --git a/src/css/typeface-lato.css b/src/css/typeface-lato.css
new file mode 100644
index 0000000..60736d0
--- /dev/null
+++ b/src/css/typeface-lato.css
@@ -0,0 +1,35 @@
+/* lato-latin-400-normal */
+@font-face {
+  font-family: Lato;
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('https://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHjx4wXg.woff2') format('woff2');
+}
+
+/* lato-latin-700-normal */
+@font-face {
+  font-family: Lato;
+  font-style: normal;
+  font-display: swap;
+  font-weight: 700;
+  src: url('https://fonts.gstatic.com/s/lato/v24/S6u9w4BMUTPHh6UVSwiPGQ.woff2') format('woff2');
+}
+
+/* lato-latin-400-italic */
+@font-face {
+  font-family: Lato;
+  font-style: italic;
+  font-display: swap;
+  font-weight: 400;
+  src: url('https://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxsAXC-q.woff2') format('woff2');
+}
+
+/* lato-latin-700-italic */
+@font-face {
+  font-family: Lato;
+  font-style: italic;
+  font-display: swap;
+  font-weight: 700;
+  src: url('https://fonts.gstatic.com/s/lato/v24/S6u_w4BMUTPHjxsI5wq_Gwft.woff2') format('woff2');
+}
diff --git a/src/img/favicon.ico b/src/img/favicon.ico
new file mode 100644
index 0000000..0559671
Binary files /dev/null and b/src/img/favicon.ico differ
diff --git a/src/partials/head-icons.hbs b/src/partials/head-icons.hbs
index 4400e2f..eb06a4b 100644
--- a/src/partials/head-icons.hbs
+++ b/src/partials/head-icons.hbs
@@ -1 +1 @@
-    {{!-- <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon"> --}}
+    <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon">
diff --git a/src/static/favicon.ico b/src/static/favicon.ico
index 1557db1..0559671 100644
Binary files a/src/static/favicon.ico and b/src/static/favicon.ico differ