diff --git a/daprdocs/content/en/docs/building-blocks/_index.md b/daprdocs/content/en/docs/building-blocks/_index.md
index 2cae471c9..2a741314b 100644
--- a/daprdocs/content/en/docs/building-blocks/_index.md
+++ b/daprdocs/content/en/docs/building-blocks/_index.md
@@ -2,7 +2,7 @@
title: "Building Blocks"
linkTitle: "Building Blocks"
weight: 30
-description: "HTTP or gRPC API that can be called from user code and uses one or more Dapr components."
+description: "HTTP or gRPC APIs that can be called from user code and uses one or more Dapr components."
---
A [building block](./architecture/building_blocks.md) is as an HTTP or gRPC API that can be called from user code and uses one or more Dapr components. Dapr consists of a set of building blocks, with extensibility to add new building blocks.
diff --git a/daprdocs/content/en/docs/building-blocks/bindings/guide-bindings.md b/daprdocs/content/en/docs/building-blocks/bindings/howto-bindings.md
similarity index 96%
rename from daprdocs/content/en/docs/building-blocks/bindings/guide-bindings.md
rename to daprdocs/content/en/docs/building-blocks/bindings/howto-bindings.md
index e8496a7a8..9ee063672 100644
--- a/daprdocs/content/en/docs/building-blocks/bindings/guide-bindings.md
+++ b/daprdocs/content/en/docs/building-blocks/bindings/howto-bindings.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Interface with external resource using bindings"
-linkTitle: "State Management"
+title: "Interface with external resource using bindings"
+linkTitle: "How-To: Bindings"
weight: 2000
---
diff --git a/daprdocs/content/en/docs/building-blocks/bindings/guide-triggers.md b/daprdocs/content/en/docs/building-blocks/bindings/howto-triggers.md
similarity index 97%
rename from daprdocs/content/en/docs/building-blocks/bindings/guide-triggers.md
rename to daprdocs/content/en/docs/building-blocks/bindings/howto-triggers.md
index 70250215a..ec24f52cb 100644
--- a/daprdocs/content/en/docs/building-blocks/bindings/guide-triggers.md
+++ b/daprdocs/content/en/docs/building-blocks/bindings/howto-triggers.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Input Bindings"
-linkTitle: "State Management"
+title: "Trigger your app with input bindings"
+linkTitle: "How-To: Triggers"
weight: 1000
---
diff --git a/daprdocs/content/en/docs/building-blocks/pubsub/_index.md b/daprdocs/content/en/docs/building-blocks/pubsub/_index.md
index 45b892230..6d7f62fa6 100644
--- a/daprdocs/content/en/docs/building-blocks/pubsub/_index.md
+++ b/daprdocs/content/en/docs/building-blocks/pubsub/_index.md
@@ -4,8 +4,6 @@ linkTitle: "Pub/Sub"
weight: 30
---
-# Publish/Subscribe Messaging
-
The [publish/subscribe pattern](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) allows your microservices to communicate with each other purely by sending messages. In this system, the **producer** of a message sends it to a **topic**, with no knowledge of what service will receive the message. A messages can even be sent if there's no consumer for it.
Similarly, a **consumer** will receive messages from a topic without knowledge of what producer sent it. This pattern is especially useful when you need to decouple microservices from one another.
diff --git a/daprdocs/content/en/docs/building-blocks/pubsub/guide-publish-message.md b/daprdocs/content/en/docs/building-blocks/pubsub/howto-publish-message.md
similarity index 95%
rename from daprdocs/content/en/docs/building-blocks/pubsub/guide-publish-message.md
rename to daprdocs/content/en/docs/building-blocks/pubsub/howto-publish-message.md
index 17d296af8..c7efb2a9c 100644
--- a/daprdocs/content/en/docs/building-blocks/pubsub/guide-publish-message.md
+++ b/daprdocs/content/en/docs/building-blocks/pubsub/howto-publish-message.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Publish Message to a Topic with Dapr"
-linkTitle: "Guide: Publish"
+title: "Publish Message to a Topic with Dapr"
+linkTitle: "How-To: Publish"
weight: 4000
---
diff --git a/daprdocs/content/en/docs/building-blocks/pubsub/guide-subscribe-topic.md b/daprdocs/content/en/docs/building-blocks/pubsub/howto-subscribe-topic.md
similarity index 98%
rename from daprdocs/content/en/docs/building-blocks/pubsub/guide-subscribe-topic.md
rename to daprdocs/content/en/docs/building-blocks/pubsub/howto-subscribe-topic.md
index 8b2c9e0ba..1af57f5b3 100644
--- a/daprdocs/content/en/docs/building-blocks/pubsub/guide-subscribe-topic.md
+++ b/daprdocs/content/en/docs/building-blocks/pubsub/howto-subscribe-topic.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Use Pub/Sub to consume messages from topics"
-linkTitle: "Guide: Publish"
+title: "Use Pub/Sub to consume messages from topics"
+linkTitle: "How-To: Publish"
weight: 3000
---
diff --git a/daprdocs/content/en/docs/building-blocks/secrets/guide-secrets.md b/daprdocs/content/en/docs/building-blocks/secrets/howto-secrets.md
similarity index 97%
rename from daprdocs/content/en/docs/building-blocks/secrets/guide-secrets.md
rename to daprdocs/content/en/docs/building-blocks/secrets/howto-secrets.md
index 1fbc2a438..0c6de41df 100644
--- a/daprdocs/content/en/docs/building-blocks/secrets/guide-secrets.md
+++ b/daprdocs/content/en/docs/building-blocks/secrets/howto-secrets.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Get Secrets with the Dapr Secrets API"
-linkTitle: "Guide: Secrets"
+title: "Get Secrets with the Dapr Secrets API"
+linkTitle: "How-To: Secrets"
weight: 1000
---
diff --git a/daprdocs/content/en/docs/building-blocks/service-invocation/invoke-discover-services.md b/daprdocs/content/en/docs/building-blocks/service-invocation/howto-invoke-discover-services.md
similarity index 97%
rename from daprdocs/content/en/docs/building-blocks/service-invocation/invoke-discover-services.md
rename to daprdocs/content/en/docs/building-blocks/service-invocation/howto-invoke-discover-services.md
index dcd45b129..a53db361f 100644
--- a/daprdocs/content/en/docs/building-blocks/service-invocation/invoke-discover-services.md
+++ b/daprdocs/content/en/docs/building-blocks/service-invocation/howto-invoke-discover-services.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Invoke & Discover Services"
-linkTitle: "Guide: Invoke & Discover Services"
+title: "Invoke & Discover Services"
+linkTitle: "How-To: Invoke & Discover Services"
description: "This guide will walk you through configuring and invoking services using dapr"
weight: 100
---
diff --git a/daprdocs/content/en/docs/building-blocks/state-management/_index.md b/daprdocs/content/en/docs/building-blocks/state-management/_index.md
index 9238194a0..c58d07698 100644
--- a/daprdocs/content/en/docs/building-blocks/state-management/_index.md
+++ b/daprdocs/content/en/docs/building-blocks/state-management/_index.md
@@ -1,7 +1,7 @@
---
title: "Dapr State Management"
linkTitle: "State Management"
-weight: 100
+weight: 20
---
# State management
diff --git a/daprdocs/content/en/docs/building-blocks/state-management/guide-get-save-state.md b/daprdocs/content/en/docs/building-blocks/state-management/howto-get-save-state.md
similarity index 96%
rename from daprdocs/content/en/docs/building-blocks/state-management/guide-get-save-state.md
rename to daprdocs/content/en/docs/building-blocks/state-management/howto-get-save-state.md
index dc1f5912e..7be913c41 100644
--- a/daprdocs/content/en/docs/building-blocks/state-management/guide-get-save-state.md
+++ b/daprdocs/content/en/docs/building-blocks/state-management/howto-get-save-state.md
@@ -1,6 +1,6 @@
---
-title: "Guide: Save and Get State Using Dapr"
-linkTitle: "Guide: Save/Get State"
+title: "Save and Get State Using Dapr"
+linkTitle: "How-To: Save/Get State"
weight: 200
---
diff --git a/daprdocs/content/en/docs/building-blocks/state-management/guide-stateful-service.md b/daprdocs/content/en/docs/building-blocks/state-management/howto-stateful-service.md
similarity index 99%
rename from daprdocs/content/en/docs/building-blocks/state-management/guide-stateful-service.md
rename to daprdocs/content/en/docs/building-blocks/state-management/howto-stateful-service.md
index 7b531f769..97395eb1e 100644
--- a/daprdocs/content/en/docs/building-blocks/state-management/guide-stateful-service.md
+++ b/daprdocs/content/en/docs/building-blocks/state-management/howto-stateful-service.md
@@ -1,6 +1,6 @@
---
title: "Create a stateful replicated service"
-linkTitle: "Guide: Stateful Service"
+linkTitle: "How-To: Stateful Service"
weight: 300
---
diff --git a/daprdocs/content/en/docs/building-blocks/state-management/query-state-store/_index.md b/daprdocs/content/en/docs/building-blocks/state-management/query-state-store/_index.md
index 2296c1975..8924972ed 100644
--- a/daprdocs/content/en/docs/building-blocks/state-management/query-state-store/_index.md
+++ b/daprdocs/content/en/docs/building-blocks/state-management/query-state-store/_index.md
@@ -1,5 +1,5 @@
---
title: "Query Backend State Store"
-linkTitle: "Query State Store"
-weight: 100
+linkTitle: "How-To: Query State Store"
+weight: 400
---
diff --git a/daprdocs/content/en/docs/concepts/_index.md b/daprdocs/content/en/docs/concepts/_index.md
index bc8aef633..e72668b9f 100644
--- a/daprdocs/content/en/docs/concepts/_index.md
+++ b/daprdocs/content/en/docs/concepts/_index.md
@@ -2,4 +2,5 @@
title: "Dapr Concepts"
linkTitle: "Concepts"
weight: 10
+description: "Learn about Dapr, including what it aims to do and how it is built."
---
\ No newline at end of file
diff --git a/daprdocs/content/en/docs/concepts/overview.md b/daprdocs/content/en/docs/concepts/overview.md
index 2d8dbcb59..65e2bc4bc 100644
--- a/daprdocs/content/en/docs/concepts/overview.md
+++ b/daprdocs/content/en/docs/concepts/overview.md
@@ -23,7 +23,7 @@ Dapr is a portable, event-driven runtime that makes it easy for enterprise devel
## Any language, any framework, anywhere
-
+
Today we are experiencing a wave of cloud adoption. Developers are comfortable with web + database application architectures (for example classic 3-tier designs) but not with microservice application architectures which are inherently distributed. It’s hard to become a distributed systems expert, nor should you have to. Developers want to focus on business logic, while leaning on the platforms to imbue their applications with scale, resiliency, maintainability, elasticity and the other attributes of cloud-native architectures.
@@ -35,7 +35,7 @@ Using Dapr you can easily build microservice applications using any language, an
## Microservice building blocks for cloud and edge
-
+
There are many considerations when architecting microservices applications. Dapr provides best practices for common capabilities when building microservice applications that developers can use in a standard way and deploy to any environment. It does this by providing distributed system building blocks.
@@ -43,13 +43,13 @@ Each of these building blocks is independent, meaning that you can use one, some
| Building Block | Description |
|----------------|-------------|
-| **[Service Invocation](../concepts/service-invocation)** | Resilient service-to-service invocation enables method calls, including retries, on remote services wherever they are located in the supported hosting environment.
-| **[State Management](../concepts/state-management)** | With state management for storing key/value pairs, long running, highly available, stateful services can be easily written alongside stateless services in your application. The state store is pluggable and can include Azure CosmosDB, Azure SQL Server, PostgreSQL, AWS DynamoDB or Redis among others.
-| **[Publish and Subscribe Messaging](../concepts/publish-subscribe-messaging)** | Publishing events and subscribing to topics | tween services enables event-driven architectures to simplify horizontal scalability and make them | silient to failure. Dapr provides at least once message delivery guarantee.
-| **[Resource Bindings](../concepts/bindings)** | Resource bindings with triggers builds further on event-driven architectures for scale and resiliency by receiving and sending events to and from any external source such as databases, queues, file systems, etc.
-| **[Actors](../concepts/actors)** | A pattern for stateful and stateless objects that make concurrency simple with method and state encapsulation. Dapr provides many capabilities in its actor runtime including concurrency, state, life-cycle management for actor activation/deactivation and timers and reminders to wake-up actors.
-| **[Observability](../concepts/observability)** | Dapr emit metrics, logs, and traces to debug and monitor both Dapr and user applications. Dapr supports distributed tracing to easily diagnose and serve inter-service calls in production using the W3C Trace Context standard and Open Telemetry to send to different monitoring tools.
-| **[Secrets](../concepts/secrets)** | Dapr provides secrets management and integrates with public cloud and local secret stores to retrieve the secrets for use in application code.
+| **[Service Invocation]({{< ref "/docs/building-blocks/service-invocation" >}})** | Resilient service-to-service invocation enables method calls, including retries, on remote services wherever they are located in the supported hosting environment.
+| **[State Management](/building-blocks/state-management)** | With state management for storing key/value pairs, long running, highly available, stateful services can be easily written alongside stateless services in your application. The state store is pluggable and can include Azure CosmosDB, Azure SQL Server, PostgreSQL, AWS DynamoDB or Redis among others.
+| **[Publish and Subscribe Messaging](/building-blocks/pubsub)** | Publishing events and subscribing to topics | tween services enables event-driven architectures to simplify horizontal scalability and make them | silient to failure. Dapr provides at least once message delivery guarantee.
+| **[Resource Bindings](/building-blocks/bindings)** | Resource bindings with triggers builds further on event-driven architectures for scale and resiliency by receiving and sending events to and from any external source such as databases, queues, file systems, etc.
+| **[Actors](/building-blocks/actors)** | A pattern for stateful and stateless objects that make concurrency simple with method and state encapsulation. Dapr provides many capabilities in its actor runtime including concurrency, state, life-cycle management for actor activation/deactivation and timers and reminders to wake-up actors.
+| **[Observability](/building-blocks/observability)** | Dapr emit metrics, logs, and traces to debug and monitor both Dapr and user applications. Dapr supports distributed tracing to easily diagnose and serve inter-service calls in production using the W3C Trace Context standard and Open Telemetry to send to different monitoring tools.
+| **[Secrets](/building-blocks/secrets)** | Dapr provides secrets management and integrates with public cloud and local secret stores to retrieve the secrets for use in application code.
## Sidecar architecture
@@ -62,7 +62,7 @@ Dapr can be hosted in multiple environments, including self hosted for local dev
In self hosted mode Dapr runs as a separate side-car process which your service code can call via HTTP or gRPC. In self hosted mode, you can also deploy Dapr onto a set of VMs.
-
+
### Kubernetes hosted
diff --git a/daprdocs/content/en/docs/getting-started/_index.md b/daprdocs/content/en/docs/getting-started/_index.md
index 4a88a302f..abf69ce79 100644
--- a/daprdocs/content/en/docs/getting-started/_index.md
+++ b/daprdocs/content/en/docs/getting-started/_index.md
@@ -2,8 +2,7 @@
title: "Getting Started with Dapr"
linkTitle: "Getting Started"
weight: 20
-description: >
- How to get up and running with Dapr
+description: "Get up and running with Dapr to start Daperizing your apps"
---
# Getting Started
diff --git a/daprdocs/content/en/docs/reference/_index.md b/daprdocs/content/en/docs/reference/_index.md
index 216612fad..b4254e1e8 100644
--- a/daprdocs/content/en/docs/reference/_index.md
+++ b/daprdocs/content/en/docs/reference/_index.md
@@ -2,6 +2,7 @@
title: "Dapr Reference Docs"
linkTitle: "Reference"
weight: 60
+description: "Detailed documentation on the Dapr API, CLI, bindings and more"
---
# Dapr references