diff --git a/tech-docs/source/architects/enterprise_architect/index.html.md.erb b/tech-docs/source/architects/enterprise_architect/index.html.md.erb
index 62328ad..0688e64 100644
--- a/tech-docs/source/architects/enterprise_architect/index.html.md.erb
+++ b/tech-docs/source/architects/enterprise_architect/index.html.md.erb
@@ -1,24 +1,9 @@
---
title: Enterprise architect
-weight: 10
+weight: 20
+layout: listing
---
-# Enterprise Architect
-
-## Summary
-
-These are exciting times at the Department for Education. In 2022 we'll continue to build services for all our users – children, adults and those in social care.
-
-Our diverse and inclusive culture reflects the society we live in. This helps us to achieve better outcomes for all our users. See what our team have to say in our [DfE digital culture video](https://www.youtube.com/watch?v=dgS-yJKR4Z4).
-
-We work in multi-disciplinary teams using Agile methods to innovate and radically improve services that:
-
-- Raise education standards and provide the best start in life for children
-- Support disadvantaged and vulnerable children and young people
-- Drive economic growth
-
-You can read more about our strategy on the [DfE digital and technology strategy blog](https://dfedigital.blog.gov.uk/).
-
As an Enterprise Architect, you will partner with senior DfE business, strategy and policy leads and stakeholders across the department, to demonstrate the business value of Enterprise Architecture as an enabler of strategy formulation, business change and technology innovation. You will collaboratively develop business capability models and roadmaps to facilitate discussion and decision making
You will be working in [for example] the Schools and Curriculum digital delivery portfolio, which includes services like Get help buying for your school, Start and manage an academy and Build or repair a school.
diff --git a/tech-docs/source/architects/index.html.md.erb b/tech-docs/source/architects/index.html.md.erb
new file mode 100644
index 0000000..ae9b62d
--- /dev/null
+++ b/tech-docs/source/architects/index.html.md.erb
@@ -0,0 +1,5 @@
+---
+title: Architects
+weight: 10
+layout: contents
+---
diff --git a/tech-docs/source/architects/technical_architect/index.html.md.erb b/tech-docs/source/architects/technical_architect/index.html.md.erb
index 926b89c..a67ecb8 100644
--- a/tech-docs/source/architects/technical_architect/index.html.md.erb
+++ b/tech-docs/source/architects/technical_architect/index.html.md.erb
@@ -1,24 +1,9 @@
---
title: Technical architect
weight: 10
+layout: listing
---
-# Technical Architect
-
-## Summary
-
-These are exciting times at the Department for Education. In 2022 we'll continue to build services for all our users – children, adults and those in social care.
-
-Our diverse and inclusive culture reflects the society we live in. This helps us to achieve better outcomes for all our users. See what our team have to say in our [DfE digital culture video](https://www.youtube.com/watch?v=dgS-yJKR4Z4).
-
-We work in multi-disciplinary teams using Agile methods to innovate and radically improve services that:
-
-- Raise education standards and provide the best start in life for children
-- Support disadvantaged and vulnerable children and young people
-- Drive economic growth
-
-You can read more about our strategy on the [DfE digital and technology strategy blog](https://dfedigital.blog.gov.uk/).
-
As a Technical Architect, you will be designing and building services for a diverse set of users, including citizens, teachers, social workers, and school professionals.
You will be working in [for example] the Schools and Curriculum digital delivery portfolio, which includes services like Get help buying for your school, Start and manage an academy and Build or repair a school.
diff --git a/tech-docs/source/layouts/contents.html.md.erb b/tech-docs/source/layouts/contents.html.md.erb
new file mode 100644
index 0000000..47b58e9
--- /dev/null
+++ b/tech-docs/source/layouts/contents.html.md.erb
@@ -0,0 +1,7 @@
+<% wrap_layout(:layout) do %>
+
<%= current_page.data.title %>
+ <% current_page.children.sort_by { |p| p.data.weight }.each do |page| %>
+ <%= link_to page.data.title, page.url %>
+ <% end %>
+<% end %>
+
diff --git a/tech-docs/source/layouts/listing.erb b/tech-docs/source/layouts/listing.erb
index 5c4f101..1f0dbb5 100644
--- a/tech-docs/source/layouts/listing.erb
+++ b/tech-docs/source/layouts/listing.erb
@@ -1,4 +1,7 @@
<% wrap_layout :layout do %>
<%= current_page.data.title %>
+
+ <%= partial "shared/introduction" %>
+
<%= yield %>
<% end %>
diff --git a/tech-docs/source/shared/_introduction.html.md.erb b/tech-docs/source/shared/_introduction.html.md.erb
new file mode 100644
index 0000000..c86abfd
--- /dev/null
+++ b/tech-docs/source/shared/_introduction.html.md.erb
@@ -0,0 +1,7 @@
+These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
+
+You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users. You will innovate to radically transform how public services are delivered and improved.
+
+Read more about software development on the
+[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
+
diff --git a/tech-docs/source/software_developers/index.html.md.erb b/tech-docs/source/software_developers/index.html.md.erb
index a5748b3..5eb9a80 100644
--- a/tech-docs/source/software_developers/index.html.md.erb
+++ b/tech-docs/source/software_developers/index.html.md.erb
@@ -1,11 +1,5 @@
---
title: Software Developers
weight: 10
+layout: contents
---
-
-# Software Developers
-
-<% current_page.children.each do |page| %>
- - <%= link_to page.data.title, page.url %>
-<% end %>
-
\ No newline at end of file
diff --git a/tech-docs/source/software_developers/junior_developer/index.html.md.erb b/tech-docs/source/software_developers/junior_developer/index.html.md.erb
index 2fbd242..271d7e7 100644
--- a/tech-docs/source/software_developers/junior_developer/index.html.md.erb
+++ b/tech-docs/source/software_developers/junior_developer/index.html.md.erb
@@ -1,20 +1,9 @@
---
title: Junior developer
-weight: 10
+weight: 100
layout: listing
---
-Grade: HEO
-
-These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
-
-You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users.. You will innovate to radically transform how public services are delivered and improved.
-
-As a junior developer you will be learning the latest technologies and trends, whilst delivering working software early and often. Working as part of a multi-disciplinary team, you’ll develop your skills to build a career as a software developer.
-
-Read more about software development on the
-[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
-
## You will
* Be responsible for the development of features of Government services
diff --git a/tech-docs/source/software_developers/lead_developer/index.html.md.erb b/tech-docs/source/software_developers/lead_developer/index.html.md.erb
index fc1ad39..cc16da6 100644
--- a/tech-docs/source/software_developers/lead_developer/index.html.md.erb
+++ b/tech-docs/source/software_developers/lead_developer/index.html.md.erb
@@ -4,15 +4,6 @@ weight: 10
layout: listing
---
-Grade: 6
-
-These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
-
-You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users. You will innovate to radically transform how public services are delivered and improved.
-
-Read more about software development on the
-[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
-
## You will
* Be responsible for a team of developers, including line management
diff --git a/tech-docs/source/software_developers/principal_developer/index.html.md.erb b/tech-docs/source/software_developers/principal_developer/index.html.md.erb
index 0e4e72f..bdc9d18 100644
--- a/tech-docs/source/software_developers/principal_developer/index.html.md.erb
+++ b/tech-docs/source/software_developers/principal_developer/index.html.md.erb
@@ -1,18 +1,9 @@
---
title: Principal developer
-weight: 10
+weight: 5
layout: listing
---
-Grade: 6
-
-These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
-
-You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users. You will innovate to radically transform how public services are delivered and improved.
-
-Read more about software development on the
-[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
-
## You will
* Be responsible for a large team of developers, setting up line management frameworks where appropriate
diff --git a/tech-docs/source/software_developers/senior_developer/index.html.md.erb b/tech-docs/source/software_developers/senior_developer/index.html.md.erb
index c61f981..998a1b9 100644
--- a/tech-docs/source/software_developers/senior_developer/index.html.md.erb
+++ b/tech-docs/source/software_developers/senior_developer/index.html.md.erb
@@ -1,18 +1,9 @@
---
-title: Senior C#/Ruby developer
-weight: 10
+title: Senior developer
+weight: 25
layout: listing
---
-Grade: 7
-
-These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
-
-You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users. You will innovate to radically transform how public services are delivered and improved.
-
-Read more about software development on the
-[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
-
## You will
* Lead and provide technical support for a large team of developers across a variety of products and services
diff --git a/tech-docs/source/software_developers/software_developer/index.html.md.erb b/tech-docs/source/software_developers/software_developer/index.html.md.erb
index 4930a7e..89d9815 100644
--- a/tech-docs/source/software_developers/software_developer/index.html.md.erb
+++ b/tech-docs/source/software_developers/software_developer/index.html.md.erb
@@ -1,18 +1,9 @@
---
-title: C#/Ruby developer
-weight: 10
+title: Software developer
+weight: 50
layout: listing
---
-Grade: SEO
-
-These are exciting times at the Department for Education. We are transforming to become a user centred organisation, delivering better outcomes for all our users through agile and iterative software development and continuous improvement.
-
-You will work with user researchers, product managers, designers, business analysts, delivery managers and content specialists as part of a multi-disciplinary team to directly deliver better outcomes for users. You will innovate to radically transform how public services are delivered and improved.
-
-Read more about software development on the
-[DfE Digital blog](https://dfedigital.blog.gov.uk/2020/10/06/software-developers/).
-
## You will
* Work with the development community to ensure we build sustainable digital products