diff --git a/src/SUMMARY.md b/src/SUMMARY.md
index 99f9c4e..2ded623 100644
--- a/src/SUMMARY.md
+++ b/src/SUMMARY.md
@@ -19,11 +19,16 @@
   * [Lists](concepts/html/lists.md)
   * [Elements](concepts/html/elements.md)
   * [Literals & Expressions](concepts/html/literals-and-expressions.md)
-  * [Components](concepts/html/components.md)
 * [Components](concepts/components/README.md)
+  * [Internal State](concepts/components/internalstate.md)
+  * [Listen to events](concepts/components/trapevents.md)
   * [Properties](concepts/components/properties.md)
-  * [Callbacks](concepts/components/callbacks.md)
+  * [Emit events](concepts/components/emitevents.md)
+  * [Nested component](concepts/components/nestedcomponents.md)
   * [Refs](concepts/components/refs.md)
+  * [Styling](concepts/components/styling.md)
+  * [Lifecycle](concepts/components/lifecycle.md)
+  * [Callbacks](concepts/components/callbacks.md)
 * [Agents](concepts/agents.md)
 * [Services](concepts/services/README.md)
   * [Format](concepts/services/format.md)
@@ -36,9 +41,7 @@
 
 ## More
 
-* [CSS](more/css.md)
 * [Roadmap](more/roadmap.md)
 * [Testing](more/testing.md)
 * [Debugging](more/debugging.md)
 * [External Libs](more/external-libs.md)
-
diff --git a/src/concepts/html/components.md b/src/concepts/components/nestedcomponents.md
similarity index 99%
rename from src/concepts/html/components.md
rename to src/concepts/components/nestedcomponents.md
index 63f50b4..b49d17b 100644
--- a/src/concepts/html/components.md
+++ b/src/concepts/components/nestedcomponents.md
@@ -1,3 +1,4 @@
+# Nested components
 ---
 description: Create complex layouts with component hierarchies
 ---
diff --git a/src/concepts/components/styling.md b/src/concepts/components/styling.md
new file mode 100644
index 0000000..cd283c0
--- /dev/null
+++ b/src/concepts/components/styling.md
@@ -0,0 +1,7 @@
+# Styling
+
+<Work in progress>
+
+A proposal for proper CSS support can be found here: [https://github.com/yewstack/yew/issues/533](https://github.com/yewstack/yew/issues/533)
+
+In the meantime you can define the style with any standard CSS tools.
diff --git a/src/more/css.md b/src/more/css.md
deleted file mode 100644
index 1f8894d..0000000
--- a/src/more/css.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# CSS
-
-<TODO>
-
-Proposal for proper CSS support can be found here: [https://github.com/yewstack/yew/issues/533](https://github.com/yewstack/yew/issues/533)
-