diff --git a/chapters/working_with_juce/user_interface/component.md b/chapters/working_with_juce/user_interface/component.md
index faf692e..875698b 100644
--- a/chapters/working_with_juce/user_interface/component.md
+++ b/chapters/working_with_juce/user_interface/component.md
@@ -1,10 +1,35 @@
 # Component
 
-- Basic Components
-  - Button
-  - Slider
-  - Label
-  - Combobox
-- Projucer live build
-  - Tricks
-- Animations
+## Basic Components
+
+### Button
+
+[API Reference](https://docs.juce.com/master/classButton.html)
+
+#### TextButton
+
+[API Reference](https://docs.juce.com/master/classTextButton.html)
+
+#### ToggleButton
+
+[API Reference](https://docs.juce.com/master/classToggleButton.html)
+
+#### DrawableButton
+
+[API Reference](https://docs.juce.com/master/classDrawableButton.html)
+
+### Slider
+
+[API Reference](https://docs.juce.com/master/classSlider.html)
+
+### Label
+
+[API Reference](https://docs.juce.com/master/classLabel.html)
+
+### ComboBox
+
+[API Reference](https://docs.juce.com/master/classComboBox.html)
+
+## Listener
+
+## Timer
diff --git a/chapters/working_with_juce/user_interface/look_and_feel.md b/chapters/working_with_juce/user_interface/look_and_feel.md
index ff89784..a0292f2 100644
--- a/chapters/working_with_juce/user_interface/look_and_feel.md
+++ b/chapters/working_with_juce/user_interface/look_and_feel.md
@@ -1,8 +1,14 @@
 # Look&Feel
 
-- LookAndFeel
-  - Colour IDs
-  - Override functions
-  - Look at JUCE implementations
+## Basics
+
+- Colour IDs
+- Override functions
+- Look at JUCE implementations
+
+## Example juce::Component
+
+## Example custom Component
+
 - Custom components
   - Look&Feel methods