diff --git a/daprdocs/.gitignore b/daprdocs/.gitignore
new file mode 100644
index 000000000..c2658d7d1
--- /dev/null
+++ b/daprdocs/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/daprdocs/content/en/getting-started/_index.md b/daprdocs/content/en/getting-started/_index.md
index bfcf1a98f..f82e9faca 100644
--- a/daprdocs/content/en/getting-started/_index.md
+++ b/daprdocs/content/en/getting-started/_index.md
@@ -22,5 +22,4 @@ The following steps in this guide are:
 1. Configure a component
 1. Explore Dapr quickstarts
 
-<a class="btn btn-primary" href="{{< ref install-dapr-cli.md >}}" role="button">First step: Install the Dapr CLI >></a>
-
+{{< button text="First step: Install the Dapr CLI >>" page="install-dapr-cli" >}}
diff --git a/daprdocs/content/en/getting-started/get-started-api.md b/daprdocs/content/en/getting-started/get-started-api.md
index b795de4f0..1e684538d 100644
--- a/daprdocs/content/en/getting-started/get-started-api.md
+++ b/daprdocs/content/en/getting-started/get-started-api.md
@@ -101,4 +101,4 @@ Exit the redis-cli with:
 exit
 ```
 
-<a class="btn btn-primary" href="{{< ref get-started-component.md >}}" role="button">Next step: Define a component >></a>
+{{< button text="Next step: Define a component >>" page="get-started-component" >}}
diff --git a/daprdocs/content/en/getting-started/get-started-component.md b/daprdocs/content/en/getting-started/get-started-component.md
index 73c13bdfd..4c026f242 100644
--- a/daprdocs/content/en/getting-started/get-started-component.md
+++ b/daprdocs/content/en/getting-started/get-started-component.md
@@ -90,4 +90,4 @@ You should see output with the secret you stored in the JSON file.
 {"my-secret":"I'm Batman"}
 ```
 
-<a class="btn btn-primary" href="{{< ref quickstarts.md >}}" role="button">Next step: Explore Dapr quickstarts >></a>
+{{< button text="Next step: Explore Dapr quickstarts >>" page="quickstarts" >}}
diff --git a/daprdocs/content/en/getting-started/install-dapr-cli.md b/daprdocs/content/en/getting-started/install-dapr-cli.md
index f6ea8a6be..30a7cc743 100644
--- a/daprdocs/content/en/getting-started/install-dapr-cli.md
+++ b/daprdocs/content/en/getting-started/install-dapr-cli.md
@@ -110,5 +110,4 @@ Flags:
 Use "dapr [command] --help" for more information about a command.
 ```
 
-<a class="btn btn-primary" href="{{< ref install-dapr-selfhost.md >}}" role="button">Next step: Initialize Dapr >></a>
-
+{{< button text="Next step: Initialize Dapr >>" page="install-dapr-selfhost" >}}
diff --git a/daprdocs/content/en/getting-started/install-dapr-selfhost.md b/daprdocs/content/en/getting-started/install-dapr-selfhost.md
index c6ab64b43..8afb8235a 100644
--- a/daprdocs/content/en/getting-started/install-dapr-selfhost.md
+++ b/daprdocs/content/en/getting-started/install-dapr-selfhost.md
@@ -109,5 +109,4 @@ You will see the Dapr config, Dapr binaries directory, and the default component
 
 {{< /tabs >}}
 
-<a class="btn btn-primary" href="{{< ref get-started-api.md >}}" role="button">Next step: Use the Dapr API >></a>
-
+{{< button text="Next step: Use the Dapr API >>" page="get-started-api" >}}
diff --git a/daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/newrelic.md b/daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/newrelic.md
index d2cb50fb3..11d382240 100644
--- a/daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/newrelic.md
+++ b/daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/newrelic.md
@@ -12,7 +12,7 @@ description: "Set-up New Relic for distributed tracing"
 
 ## Configure Dapr tracing
 
-Dapr natively captures metrics and traces that can be send directly to New Relic. The easiest way to export these is by configuring Dapr to send the traces to [New Relic's Trace API](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/trace-api/report-zipkin-format-traces-trace-api#existing-zipkin) using the Zipkin trace format.
+Dapr natively captures metrics and traces that can be send directly to New Relic. The easiest way to export these is by configuring Dapr to send the traces to [New Relic's Trace API](https://docs.newrelic.com/docs/distributed-tracing/trace-api/report-zipkin-format-traces-trace-api/) using the Zipkin trace format.
 
 In order for the integration to send data to New Relic [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform), you need a [New Relic Insights Insert API key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#insights-insert-key). 
 
@@ -108,8 +108,7 @@ All the data that is collected from Dapr, Kubernetes or any services that run on
 * [New Relic Account Signup](https://newrelic.com/signup)
 * [Telemetry Data Platform](https://newrelic.com/platform/telemetry-data-platform)
 * [Distributed Tracing](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/get-started/introduction-distributed-tracing)
-* [New Relic Trace API](https://docs.newrelic.com/docs/understand-dependencies/distributed-tracing/trace-api)
-* [New Relic Metric API](https://docs.newrelic.com/docs/telemetry-data-platform/get-data/apis/introduction-metric-api)
+* [New Relic Trace API](https://docs.newrelic.com/docs/distributed-tracing/trace-api/introduction-trace-api/)
 * [Types of New Relic API keys](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys)
 * [New Relic OpenTelemetry User Experience](https://blog.newrelic.com/product-news/opentelemetry-user-experience/)
 * [Alerts and Applied Intelligence](https://docs.newrelic.com/docs/alerts-applied-intelligence)