diff --git a/src/content/docs/assets/governance-structure.png b/src/content/docs/assets/governance-structure.png
new file mode 100644
index 00000000..d715df33
Binary files /dev/null and b/src/content/docs/assets/governance-structure.png differ
diff --git a/src/content/docs/governance.md b/src/content/docs/governance.mdx
similarity index 54%
rename from src/content/docs/governance.md
rename to src/content/docs/governance.mdx
index a2c08ba0..03c483e0 100644
--- a/src/content/docs/governance.md
+++ b/src/content/docs/governance.mdx
@@ -2,34 +2,41 @@
title: Governance
---
+import { LinkCard } from '@astrojs/starlight/components';
+
In this section you will find a detailed description of how *Web3Privacy Now* governance works.
-## Structure
-### Basic units
+![Governance Structure](./assets/governance-structure.png)
+
+## Governance Units
*The Web3Privacy Now* initiative is composed of these basic governance units:
-| Name | Purpose |
-| --- | --- |
-| [Congress](/congress) | top organ, votes on most important issues, elects Core Team/Association executives |
-| [Core Team](/core-team) | main decision-making and executive body |
-| [Association](/association) | legal entity, executes Core Team requirements, accepts donations, pay expenses |
-
-### Support units
-
-| Name | Purpose | Control |
-| --- | --- | --- |
-| [Treasury](/treasury) | funds management | [Core Team](/core-team) |
-| [Contributors Guild](/guild) | group of members receiving incentives | [Association](/association) |
-| Marketing & Outreach | marketing and social networks | autonomous |
-| Partnerships | recruitment of new (organizational) members | autonomous |
-| IT Operation | operation of technical infrastructure | autonomous |
-| Design department | designing graphics for our projects | autonomous |
-
-### Project-specific
-
-Additionaly, each project has its own [Workgroup](/workgroups#project-specific).
-
+
+
+
+
+
## Personal roles within initiative
diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx
index 17f61ea1..39fba226 100644
--- a/src/content/docs/index.mdx
+++ b/src/content/docs/index.mdx
@@ -59,20 +59,6 @@ A summary of what we have already accomplished can be found on the [History](/hi
-
-## Tools we using
-
-We use various [Communication tools](/communication). For our work we use different [Git repositories](/git), and for organizational purposes our effort is divided into several [Workgroups](/workgroups).
-
-
-
-
-
-
-
-
-
-
## Become part of the community
@@ -88,6 +74,18 @@ We use various [Communication tools](/communication). For our work we use differ
+## For contributors
+
+We use various [Communication tools](/communication). For our work we use different [Git repositories](/git), and for organizational purposes our effort is divided into several [Workgroups](/workgroups).
+
+
+
+
+
+
+
+
+
## Governance
The initiative is managed by a [Core Team](/core-team) of four people who take care of operations. We are also in the process of creating [Association](/association) as legal entity for our activities.
diff --git a/src/content/docs/resources/funding.md b/src/content/docs/resources/funding.md
index c75db188..faee6ee0 100644
--- a/src/content/docs/resources/funding.md
+++ b/src/content/docs/resources/funding.md
@@ -12,8 +12,17 @@ We are developing a transparent grant system that will serve as the main way to
* operating costs
* marketing and promotional expenses
-## Funding Requests (FR)
+The subject of the funding request cannot be the direct payment of contributors - for these purposes it is necessary to become a member of the [Contributors Guild](/guild).
-Funding requests is a transparent application process to receive money from our [Treasury](/treasury).
+## Funding Requests
-All funding requests are handled through Issues in the [`@web3privacy/funding`](https://github.com/web3privacy/funding) repository.
\ No newline at end of file
+*Funding Request Proposals* (FRPs) is a transparent application process to receive money from our [Treasury](/treasury). Most of our income is redistributed through these applications.
+
+Each application will be assessed by members of the [Core Team](/core-team), according to whose decision it will be accepted or rejected.
+
+All funding requests are handled through Issues in the [`@web3privacy/funding`](https://github.com/web3privacy/funding) repository.
+
+### Proposal requirements
+* the amount required
+* the purpose for which the funds will be used
+* the person or group of people responsible
\ No newline at end of file
diff --git a/src/content/docs/resources/training-education.md b/src/content/docs/resources/training-education.md
deleted file mode 100644
index 2fc5e16a..00000000
--- a/src/content/docs/resources/training-education.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Training and Education
----
-
-Education is very important to us, which is why we run various educational programs and workshops, both for our contributors and the wider community as part of our [Membership](/membership) program.
\ No newline at end of file
diff --git a/src/content/docs/resources/training-education.mdx b/src/content/docs/resources/training-education.mdx
new file mode 100644
index 00000000..7d69e363
--- /dev/null
+++ b/src/content/docs/resources/training-education.mdx
@@ -0,0 +1,15 @@
+---
+title: Training and Education
+---
+
+import { LinkCard } from '@astrojs/starlight/components';
+
+Education is very important to us, which is why we run various educational programs and workshops, both for our contributors and the wider community as part of our [Membership](/membership) program.
+
+## W3PN Meta-hackathons
+
+An annual multi-day gathering of people around Web3Privacy Now, where we educate each other and move our project forward.
+
+[Meta-hackathon](/events/types/#meta-hackathon) is an event organized by our [Events](/events) department.
+
+
\ No newline at end of file
diff --git a/src/content/docs/treasury.md b/src/content/docs/treasury.md
index 03b78aa9..5c6e58a0 100644
--- a/src/content/docs/treasury.md
+++ b/src/content/docs/treasury.md
@@ -10,6 +10,6 @@ Treasury management is the responsibility of the [Core Team](/core-team).
## Distribution
* 30% automatically goes to [Contributors Guild](/guild), eq. directly to contributors
-* the remaining 70% is distributed through [Funding Requests](http://localhost:4322/resources/funding#funding-requests-fr) to specific projects or Workgroups
+* the remaining 70% is distributed through [Funding Requests](/resources/funding#funding-requests) to specific projects or Workgroups
![Treasury flow](./assets/treasury-flow.png)
\ No newline at end of file