diff --git a/docs/about.md b/docs/about.md
index d4cbe299..48cba36c 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -17,7 +17,7 @@ brick.buttonEnter.onEvent(ButtonEvent.Bumped, () => {
 })
 ```
 
-The editor works in [most modern browsers](/browsers). It works [offline](/offline) once loaded and doesn't require any installation.
+The editor works in [most modern browsers](/browsers). It works [offline](/offline) once loaded and doesn't require any installation. Take a look at some of the [features](/about/editor-features) of the editor.
 
 ## Compile and Flash: Your Program!
 
diff --git a/docs/about/editor-features.md b/docs/about/editor-features.md
new file mode 100644
index 00000000..f0e57fba
--- /dev/null
+++ b/docs/about/editor-features.md
@@ -0,0 +1,72 @@
+# @extends
+
+#### #blocks-images
+
+| |
+|-|
+| ![Blocks Toolbox with Loops shelf open](/static/about/blocks-toolbox.png) |
+| Blocks Toolbox |
+
+#### #home-images
+
+| |
+|-|
+| ![Home button](/static/about/home-button.png) |
+| Home Button |
+
+#### #share-images
+
+| |
+|-|
+| ![Share button](/static/about/share-button.png) |
+| Share Button |
+
+#### #blocksjs-images
+
+| |
+|-|
+| ![Switch from Blocks to JavaScript](/static/about/blocks-to-js.gif) |
+| Switch from Blocks to JavaScript |
+
+#### #help-images
+
+| |
+|-|
+| ![Help button](/static/about/help-button.png) |
+| Help Button |
+
+#### #moresettings-images
+
+| |
+|-|
+| ![More settings button](/static/about/more-settings.png) |
+| More Button |
+
+#### #undoredo-images
+
+| | | |
+|-|-|-|
+| ![Undo button](/static/about/undo-button.png) | | ![Redo button](/static/about/redo-button.png) |
+| Undo Button | | Redo Button |
+
+#### #zoom-images
+
+| | | |
+|-|-|-|
+| ![Zoom in button](/static/about/zoom-in.png) | | ![Zoom out button](/static/about/zoom-out.png) |
+| Zoom In | | Zoom Out |
+
+#### #saveproject-images
+
+| |
+|-|
+| ![Save project field](/static/about/save-project.png) |
+| Save Project |
+
+#### #download-images
+
+| |
+|-|
+| ![Download button](/static/about/download-button.png) |
+| Download Button |
+
diff --git a/docs/static/about/blocks-to-js.gif b/docs/static/about/blocks-to-js.gif
new file mode 100644
index 00000000..0efb5da3
Binary files /dev/null and b/docs/static/about/blocks-to-js.gif differ
diff --git a/docs/static/about/blocks-toolbox.png b/docs/static/about/blocks-toolbox.png
new file mode 100644
index 00000000..e7254dca
Binary files /dev/null and b/docs/static/about/blocks-toolbox.png differ
diff --git a/docs/static/about/download-button.png b/docs/static/about/download-button.png
new file mode 100644
index 00000000..b0b25ea2
Binary files /dev/null and b/docs/static/about/download-button.png differ
diff --git a/docs/static/about/help-button.png b/docs/static/about/help-button.png
new file mode 100644
index 00000000..07eb9253
Binary files /dev/null and b/docs/static/about/help-button.png differ
diff --git a/docs/static/about/home-button.png b/docs/static/about/home-button.png
new file mode 100644
index 00000000..2e5b18fc
Binary files /dev/null and b/docs/static/about/home-button.png differ
diff --git a/docs/static/about/more-settings.png b/docs/static/about/more-settings.png
new file mode 100644
index 00000000..5e68b3fa
Binary files /dev/null and b/docs/static/about/more-settings.png differ
diff --git a/docs/static/about/redo-button.png b/docs/static/about/redo-button.png
new file mode 100644
index 00000000..465c2fce
Binary files /dev/null and b/docs/static/about/redo-button.png differ
diff --git a/docs/static/about/save-project.png b/docs/static/about/save-project.png
new file mode 100644
index 00000000..f35fffee
Binary files /dev/null and b/docs/static/about/save-project.png differ
diff --git a/docs/static/about/share-button.png b/docs/static/about/share-button.png
new file mode 100644
index 00000000..c433d846
Binary files /dev/null and b/docs/static/about/share-button.png differ
diff --git a/docs/static/about/share-dialog.png b/docs/static/about/share-dialog.png
new file mode 100644
index 00000000..510abdd5
Binary files /dev/null and b/docs/static/about/share-dialog.png differ
diff --git a/docs/static/about/undo-button.png b/docs/static/about/undo-button.png
new file mode 100644
index 00000000..0e23f43b
Binary files /dev/null and b/docs/static/about/undo-button.png differ
diff --git a/docs/static/about/zoom-in.png b/docs/static/about/zoom-in.png
new file mode 100644
index 00000000..755519dc
Binary files /dev/null and b/docs/static/about/zoom-in.png differ
diff --git a/docs/static/about/zoom-out.png b/docs/static/about/zoom-out.png
new file mode 100644
index 00000000..aa8080d4
Binary files /dev/null and b/docs/static/about/zoom-out.png differ