diff --git a/components/layout/Header.module.css b/components/layout/Header.module.css
index 44bac0c5..42bf47e3 100644
--- a/components/layout/Header.module.css
+++ b/components/layout/Header.module.css
@@ -8,6 +8,7 @@
 .title {
   flex: 1;
   font-size: var(--font-size-lg);
+  font-weight: 700;
   display: flex;
   align-items: center;
   flex-direction: row;
diff --git a/components/pages/settings/websites/TrackingCode.js b/components/pages/settings/websites/TrackingCode.js
index dd2b351a..99fb51e1 100644
--- a/components/pages/settings/websites/TrackingCode.js
+++ b/components/pages/settings/websites/TrackingCode.js
@@ -2,7 +2,11 @@ import { TextArea } from 'react-basics';
 import { TRACKER_SCRIPT_URL } from 'lib/constants';
 
 export default function TrackingCode({ websiteId }) {
-  const code = `<script async src="${TRACKER_SCRIPT_URL}" data-website-id="${websiteId}"></script>`;
+  const url = TRACKER_SCRIPT_URL.startsWith('http')
+    ? TRACKER_SCRIPT_URL
+    : `${location.origin}${TRACKER_SCRIPT_URL}`;
+
+  const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
 
   return (
     <>
diff --git a/components/pages/settings/websites/WebsiteDetails.js b/components/pages/settings/websites/WebsiteDetails.js
index d0002f42..dc44096d 100644
--- a/components/pages/settings/websites/WebsiteDetails.js
+++ b/components/pages/settings/websites/WebsiteDetails.js
@@ -46,8 +46,8 @@ export default function WebsiteDetails({ websiteId }) {
           </Item>
           <Item>{values?.name}</Item>
         </Breadcrumbs>
-        <Link href={`/analytics/websites/${websiteId}`}>
-          <a target="_blank">
+        <Link href={`/websites/${websiteId}`}>
+          <a>
             <Button variant="primary">
               <Icon>
                 <ExternalLink />
diff --git a/components/pages/settings/websites/WebsitesTable.js b/components/pages/settings/websites/WebsitesTable.js
index 0eec09d8..ea81c14d 100644
--- a/components/pages/settings/websites/WebsitesTable.js
+++ b/components/pages/settings/websites/WebsitesTable.js
@@ -38,8 +38,8 @@ export default function WebsitesTable({ columns = [], rows = [] }) {
                   </Button>
                 </a>
               </Link>
-              <Link href={`/analytics/websites/${id}`}>
-                <a target="_blank">
+              <Link href={`/websites/${id}`}>
+                <a>
                   <Button>
                     <Icon>
                       <ExternalLink />