diff --git a/altair/README.md b/altair/README.md
new file mode 100644
index 0000000..450977d
--- /dev/null
+++ b/altair/README.md
@@ -0,0 +1,27 @@
+---
+title: Learn Altair
+description: >
+    Learn the basics of Altair, a high-performance visualization library,
+    using lessons developed at the University of Washington.
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/01_introduction.py) Introduction to Altair
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/02_marks_encoding.py) Data Types, Graphical Marks, and Visual Encoding Channels
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/03_data_transformation.py) Data Transformation
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/04_scales_axes_legends.py) Scales, Axes, and Legends
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/05_view_composition.py) Multi-View Composition
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/06_interaction.py) Interaction
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/07_cartographic.py) Cartographic Visualization
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/altair/08_debugging.py) Altair Debugging Guide
+
+## Acknowledgments
+
+These notebooks were created by Jeffrey Heer, Dominik Moritz, Jake VanderPlas, and Brock Craft
+as part of the [Visualization Curriculum](https://uwdata.github.io/visualization-curriculum/intro.html)
+at the University of Washington.
+Our thanks to the authors for making their work available under an open license:
+if we all share a little, we all get a lot.
diff --git a/altair/index.md b/altair/index.md
deleted file mode 100644
index 8ab1bf2..0000000
--- a/altair/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Learn Altair
-description: >
-    Learn the basics of Altair, a high-performance visualization library,
-    using lessons developed at the University of Washington.
----
-
-## Acknowledgments
-
-These notebooks were created by Jeffrey Heer, Dominik Moritz, Jake VanderPlas, and Brock Craft
-as part of the [Visualization Curriculum](https://uwdata.github.io/visualization-curriculum/intro.html)
-at the University of Washington.
-Our thanks to the authors for making their work available under an open license:
-if we all share a little, we all get a lot.
diff --git a/bin/build.py b/bin/build.py
index 9ebb091..9da8d27 100644
--- a/bin/build.py
+++ b/bin/build.py
@@ -30,8 +30,8 @@ def transform_lessons(data: dict, root: Path, branch: str) -> dict:
             }
             for nb in course.get("notebooks", [])
         ]
-        index_md = root / course_id / "index.md"
-        post = frontmatter.load(index_md)
+        readme_md = root / course_id / "README.md"
+        post = frontmatter.load(readme_md)
         course["body_html"] = md.markdown(post.content, extensions=["fenced_code", "tables"])
     return data
 
diff --git a/bin/extract.py b/bin/extract.py
index 44b9134..75a5931 100644
--- a/bin/extract.py
+++ b/bin/extract.py
@@ -14,9 +14,9 @@
 
 def extract_lessons(root: Path) -> dict:
     lessons = {}
-    for index_file in sorted(root.glob("*/index.md")):
-        lesson_dir = index_file.parent
-        post = frontmatter.load(index_file)
+    for readme_file in sorted(root.glob("*/README.md")):
+        lesson_dir = readme_file.parent
+        post = frontmatter.load(readme_file)
         notebooks = sorted(
             p.name
             for p in lesson_dir.glob("*.py")
diff --git a/duckdb/README.md b/duckdb/README.md
new file mode 100644
index 0000000..1a125f3
--- /dev/null
+++ b/duckdb/README.md
@@ -0,0 +1,26 @@
+---
+title: Learn DuckDB
+description: >
+    These notebooks teach you the basics of DuckDB,
+    a fast in-memory database engine that can interoperate
+    with dataframes, and show how marimo gives DuckDB superpowers.
+tracking: 48
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/duckdb/01_getting_started.py) What is DuckDB?
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/duckdb/08_loading_parquet.py) Loading Parquet files with DuckDB
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/duckdb/09_loading_json.py) Loading JSON
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/duckdb/11_working_with_apache_arrow.py) Working with Apache Arrow
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/duckdb/DuckDB_Loading_CSVs.py) Loading CSVs
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Mustjaab](https://github.com/Mustjaab)
+* [julius383](https://github.com/julius383)
+* [thliang01](https://github.com/thliang01)
diff --git a/duckdb/index.md b/duckdb/index.md
deleted file mode 100644
index cb8bfb0..0000000
--- a/duckdb/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Learn DuckDB
-description: >
-    These notebooks teach you the basics of DuckDB,
-    a fast in-memory database engine that can interoperate
-    with dataframes, and show how marimo gives DuckDB superpowers.
-tracking: 48
----
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Mustjaab](https://github.com/Mustjaab)
-* [julius383](https://github.com/julius383)
-* [thliang01](https://github.com/thliang01)
diff --git a/optimization/README.md b/optimization/README.md
new file mode 100644
index 0000000..1df1617
--- /dev/null
+++ b/optimization/README.md
@@ -0,0 +1,34 @@
+---
+title: Learn Optimization
+description: >
+    Learn the basics of convex optimization using Python, and
+    see how to apply these ideas to vehicle control, portfolio
+    allocation in finance, and other areas.
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+After working through these notebooks, you'll understand how to create
+and solve optimization problems using Python's
+[CVXPY](https://github.com/cvxpy/cvxpy) library, as well as how to
+apply what you've learned to real-world problems.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/01_least_squares.py) Least Squares
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/02_linear_program.py) Linear Program
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/03_minimum_fuel_optimal_control.py) Minimal Fuel Optimal Control
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/04_quadratic_program.py) Quadratic Program
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/05_portfolio_optimization.py) Portfolio Optimization
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/06_convex_optimization.py) Convex Optimization
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/optimization/07_sdp.py) Semidefinite Program
+
+![SpaceX](https://www.debugmind.com/wp-content/uploads/2020/01/spacex-1.jpg)
+
+_SpaceX solves convex optimization problems onboard to land its rockets, using CVXGEN, a code generator for quadratic programming developed at Stephen Boyd's Stanford lab. Photo by SpaceX, licensed CC BY-NC 2.0._
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Akshay Agrawal](https://github.com/akshayka)
diff --git a/optimization/index.md b/optimization/index.md
deleted file mode 100644
index c8c0c33..0000000
--- a/optimization/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Learn Optimization
-description: >
-    Learn the basics of convex optimization using Python, and
-    see how to apply these ideas to vehicle control, portfolio
-    allocation in finance, and other areas.
----
-
-After working through these notebooks, you'll understand how to create
-and solve optimization problems using Python's
-[CVXPY](https://github.com/cvxpy/cvxpy) library, as well as how to
-apply what you've learned to real-world problems.
-
-![SpaceX](https://www.debugmind.com/wp-content/uploads/2020/01/spacex-1.jpg)
-
-_SpaceX solves convex optimization problems onboard to land its rockets, using CVXGEN, a code generator for quadratic programming developed at Stephen Boyd's Stanford lab. Photo by SpaceX, licensed CC BY-NC 2.0._
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Akshay Agrawal](https://github.com/akshayka)
diff --git a/polars/README.md b/polars/README.md
new file mode 100644
index 0000000..c14813d
--- /dev/null
+++ b/polars/README.md
@@ -0,0 +1,37 @@
+---
+title: Learn Polars
+description: >
+    Learn the basics of data wrangling with a high-performance Python library
+    called Polars.
+tracking: 40
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/01_why_polars.py) An introduction to Polars
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/02_dataframes.py) DataFrames
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/03_loading_data.py) Loading Data
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/04_basic_operations.py) Basic operations on data
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/05_reactive_plots.py) Reactive Plots
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/06_dataframe_transformer.py) Polars with Marimo's Dataframe Transformer
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/07_querying_with_sql.py) SQL Features in Marimo and Polars
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/08_working_with_columns.py) Working with Columns
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/09_data_types.py) Data Types
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/10_strings.py) Strings
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/11_missing_data.py) Dealing with Missing Data
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/12_aggregations.py) Aggregations
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/13_window_functions.py) Window Functions
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/14_user_defined_functions.py) User-Defined Functions
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/polars/16_lazy_execution.py) Lazy Execution
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Koushik Khan](https://github.com/koushikkhan)
+* [Péter Gyarmati](https://github.com/peter-gy)
+* [Joram Mutenge](https://github.com/jorammutenge)
+* [etrotta](https://github.com/etrotta)
+* [Debajyoti Das](https://github.com/debajyotid2)
diff --git a/polars/index.md b/polars/index.md
deleted file mode 100644
index 11ce1d3..0000000
--- a/polars/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Learn Polars
-description: >
-    Learn the basics of data wrangling with a high-performance Python library
-    called Polars.
-tracking: 40
----
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Koushik Khan](https://github.com/koushikkhan)
-* [Péter Gyarmati](https://github.com/peter-gy)
-* [Joram Mutenge](https://github.com/jorammutenge)
-* [etrotta](https://github.com/etrotta)
-* [Debajyoti Das](https://github.com/debajyotid2)
diff --git a/probability/README.md b/probability/README.md
new file mode 100644
index 0000000..9fa66b2
--- /dev/null
+++ b/probability/README.md
@@ -0,0 +1,42 @@
+---
+title: Learn Probability
+description: >
+    These marimo notebooks teach the fundamentals of probability with
+    an emphasis on interactive learning and computation in Python.
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+Much of the structure and many explanations are adapted from Chris Piech's
+[Probability for Computer Scientists](https://chrispiech.github.io/probabilityForComputerScientists/en/index.html)
+course reader.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/01_sets.py) Sets
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/02_axioms.py) Axioms of Probability
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/03_probability_of_or.py) Probability of Or
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/04_conditional_probability.py) Conditional Probability
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/05_independence.py) Independence in Probability Theory
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/06_probability_of_and.py) Probability of And
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/07_law_of_total_probability.py) Law of Total Probability
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/08_bayes_theorem.py) Bayes' Theorem
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/09_random_variables.py) Random Variables
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/10_probability_mass_function.py) Probability Mass Functions
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/11_expectation.py) Expectation
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/12_variance.py) Variance
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/13_bernoulli_distribution.py) Bernoulli Distribution
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/14_binomial_distribution.py) Binomial Distribution
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/15_poisson_distribution.py) Poisson Distribution
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/16_continuous_distribution.py) Continuous Distributions
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/17_normal_distribution.py) Normal Distribution
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/18_central_limit_theorem.py) Central Limit Theorem
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/19_maximum_likelihood_estimation.py) Maximum Likelihood Estimation
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/20_naive_bayes.py) Naive Bayes Classification
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/probability/21_logistic_regression.py) Logistic Regression
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Srihari Thyagarajan](https://github.com/Haleshot)
diff --git a/probability/index.md b/probability/index.md
deleted file mode 100644
index 8bb764b..0000000
--- a/probability/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Learn Probability
-description: >
-    These marimo notebooks teach the fundamental of probability with
-    an emphasis on interactive learning and computation in Python.
----
-
-Much of the structure and many explanations are adapted from Chris Piech's
-[Probability for Computer Scientists](https://chrispiech.github.io/probabilityForComputerScientists/en/index.html)
-course reader.
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Srihari Thyagarajan](https://github.com/Haleshot)
diff --git a/python/README.md b/python/README.md
new file mode 100644
index 0000000..1589fd5
--- /dev/null
+++ b/python/README.md
@@ -0,0 +1,27 @@
+---
+title: Learn Python
+description: >
+    These notebooks will help you learn the basics of Python
+    programming in an easy, interactive way.
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/01_numbers.py) Numbers
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/02_strings.py) Strings
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/03_collections.py) Collections
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/04_conditional_logic.py) Conditional logic
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/05_loops.py) Loops
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/06_dictionaries.py) Dictionaries
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/07_advanced_collections.py) Advanced Collections
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/08_functions.py) Functions
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/09_modules.py) Using Modules
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/python/10_exceptions.py) Handling Errors
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Srihari Thyagarajan](https://github.com/Haleshot)
diff --git a/python/index.md b/python/index.md
deleted file mode 100644
index 98488aa..0000000
--- a/python/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Learn Python
-description: >
-    These notebooks will help you learn the basics of Python
-    programming in an easy, interactive way.
----
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Srihari Thyagarajan](https://github.com/Haleshot)
diff --git a/queueing/README.md b/queueing/README.md
new file mode 100644
index 0000000..53e9ae4
--- /dev/null
+++ b/queueing/README.md
@@ -0,0 +1,33 @@
+---
+title: Learn Queueing Theory
+description: >
+    Why is your line always slower than the other one? Why do
+    traffic jams happen without any apparent cause? These lessons
+    use a mixture of queueing theory and simulation to explain
+    these scenarios and others.
+tracking: 136
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/01_basic_ideas.py) Basic Ideas in Queueing Theory
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/02_queue_formation.py) Queue Formation
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/03_littles_law.py) Little's Law
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/04_sojourn_time.py) Sojourn Time
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/05_mm1_nonlinearity.py) M/M/1 Queue Nonlinearity
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/06_pooled_vs_separate.py) Pooled vs. Separate Queues
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/07_late_merge.py) Late Merge
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/08_inspectors_paradox.py) The Inspector's Paradox
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/09_convoy_effect.py) The Convoy Effect
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/10_priority_starvation.py) Priority Starvation
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/11_tandem_queue.py) Tandem Queue Blocking
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/12_rush_hour.py) Rush Hour Displacement
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/queueing/13_braess_paradox.py) Braess's Paradox
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Greg Wilson](https://github.com/gvwilson)
diff --git a/queueing/index.md b/queueing/index.md
deleted file mode 100644
index 0e2832e..0000000
--- a/queueing/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Learn Queueing Theory
-description: >
-    Why is your line always slower than the other one? Why do
-    traffic jams happen without any apparent cause? These lessons
-    use a mixture of queueing theory and simulation to explain
-    these scenarios and others.
-tracking: 136
----
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Greg Wilson](https://github.com/gvwilson)
diff --git a/sql/README.md b/sql/README.md
new file mode 100644
index 0000000..f672250
--- /dev/null
+++ b/sql/README.md
@@ -0,0 +1,25 @@
+---
+title: Learn SQL
+description: >
+    Learn the basics of SQL, the industry standard for interacting
+    with relational databases. These notebooks also show how easy
+    it is to work with relational data in marimo.
+tracking: 133
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/01_basic_select.py) Basic Selection
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/02_filter.py) Filtering
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/03_aggregate_group.py) Aggregating and Grouping
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/04_null.py) Missing Data
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/05_join.py) Combining Tables
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/sql/06_keys.py) Primary and Foreign Keys
+
+## Contributors
+
+Thanks to our notebook authors:
+
+* [Greg Wilson](https://github.com/gvwilson)
diff --git a/sql/index.md b/sql/index.md
deleted file mode 100644
index 85ad2de..0000000
--- a/sql/index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Learn SQL
-description: >
-    Learn the basics of SQL, the industry standard for interacting
-    with relational databases. These notebooks also show how easy
-    it is to work with relational data in marimo.
-tracking: 133
----
-
-## Contributors
-
-Thanks to our notebook authors:
-
-* [Greg Wilson](https://github.com/gvwilson)
diff --git a/tools/README.md b/tools/README.md
new file mode 100644
index 0000000..843cf57
--- /dev/null
+++ b/tools/README.md
@@ -0,0 +1,14 @@
+---
+title: Tools
+description: >
+    These notebooks show how to integrate educational widgets
+    and other tools into your notebooks.
+---
+
+You can open and run these notebooks in [molab](https://molab.marimo.io), marimo's free hosted notebook platform.
+
+## Notebooks
+
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/tools/01_wiggly.py) wigglystuff Widgets
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/tools/02_formative.py) Formative Assessment Widgets
+- [![Open in molab](https://marimo.io/molab-shield.svg)](https://molab.marimo.io/github/marimo-team/learn/blob/main/tools/03_turtles.py) Turtle Graphics
diff --git a/tools/index.md b/tools/index.md
deleted file mode 100644
index b1ec429..0000000
--- a/tools/index.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Tools
-description: >
-    These notebooks show how to integrate educational widgets
-    and other tools into your notebooks.
----