diff --git a/docs/en/02_Developer_Guides/03_Forms/Fields/01_Common_Subclasses.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
similarity index 93%
rename from docs/en/02_Developer_Guides/03_Forms/Fields/01_Common_Subclasses.md
rename to docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
index 908cfb618..951578f22 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Fields/01_Common_Subclasses.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
@@ -1,9 +1,9 @@
-title: Common FormField Types
+title: Common FormField type subclasses
 summary: A table containing a list of the common FormField subclasses.
 
-# Form Field Types
+# Common FormField type subclasses
 
-This is a highlevel overview of available `[api:FormField]` subclasses. An automatically generated list is available 
+This is a high level overview of available `[api:FormField]` subclasses. An automatically generated list is available 
 on the SilverStripe API documentation.
 
 ## Basic
@@ -20,7 +20,7 @@ on the SilverStripe API documentation.
  * `[api:FormAction]`: Button element for forms, both for `<input type="submit">` and `<button>`.
  * `[api:ResetFormAction]`: Action that clears all fields on a form.
 
-## Formatted Input
+## Formatted input
 
  * `[api:AjaxUniqueTextField]`: Text field that automatically checks that the value entered is unique for the given set of fields in a given set of tables.
  * `[api:ConfirmedPasswordField]`: Two masked input fields, checks for matching passwords.
@@ -38,7 +38,7 @@ on the SilverStripe API documentation.
  * `[api:OptionsetField]`: Set of radio buttons designed to emulate a dropdown.
  * `[api:PhoneNumberField]`: Field for displaying phone numbers. It separates the number, the area code and optionally the country code and extension.
  * `[api:SelectionGroup]`: SelectionGroup represents a number of fields which are selectable by a radio button that appears at the beginning of each item.
- * `[api:TimeField]`: Input field with time-specific, localized validation.
+ * `[api:TimeField]`: Input field with time-specific, localised validation.
 
 ## Structure
 
diff --git a/docs/en/02_Developer_Guides/03_Forms/Fields/02_DateField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/02_DateField.md
similarity index 100%
rename from docs/en/02_Developer_Guides/03_Forms/Fields/02_DateField.md
rename to docs/en/02_Developer_Guides/03_Forms/Field_types/02_DateField.md
diff --git a/docs/en/02_Developer_Guides/03_Forms/Fields/03_HTMLEditorField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
similarity index 97%
rename from docs/en/02_Developer_Guides/03_Forms/Fields/03_HTMLEditorField.md
rename to docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
index fbf801f9b..6dd568626 100644
--- a/docs/en/02_Developer_Guides/03_Forms/Fields/03_HTMLEditorField.md
+++ b/docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
@@ -1,6 +1,7 @@
-title: Rich-Text Editing (WYSIWYG)
+title: Rich-text editing (WYSIWYG)
+summary: SilverStripe's use and configuration of TinyMCE html editor.
 
-# Rich-Text Editing (WYSIWYG)
+# Rich-text editing (WYSIWYG)
 
 Editing and formatting content is the bread and butter of every content management system, which is why SilverStripe 
 has a tight integration with our preferred editor library, [TinyMCE](http://tinymce.com).
@@ -163,7 +164,7 @@ You can then enable this plugin through the [api:HtmlEditorConfig::enablePlugins
 For more complex examples see the [Creating a Plugin](http://www.tinymce.com/wiki.php/Creating_a_plugin) in TinyMCE
 documentation, or browse through plugins that come with the Framework at `thirdparty/tinymce/plugins`.
 
-## Image and Media Insertion
+## Image and media insertion
 
 The `[api:HtmlEditorField]` API also handles inserting images and media files into the managed HTML content. It can be 
 used both for referencing files on the webserver filesystem (through the `[api:File]` and `[api:Image]` APIs), as well 
@@ -212,7 +213,7 @@ to successfully process HTML5 tags, please use the
 
 ## Recipes
 
-### Customizing the "Insert" panels
+### Customising the "Insert" panels
 
 In the standard installation, you can insert links (internal/external/anchor/email),
 images as well as flash media files. The forms used for preparing the new content element
@@ -253,8 +254,8 @@ Note: The dropdown is only available if more than one config exists.
 Each interface can have multiple fields of this type, each with their own toolbar to set formatting
 and insert HTML elements. They do share one common set of dialogs for inserting links and other media though,
 encapsulated in the `[api:HtmlEditorField_Toolbar]` class.
-In the CMS, those dialogs are automatically instanciated, but in your own interfaces outside
-of the CMS you have to take care of instanciation yourself:
+In the CMS, those dialogs are automatically instantiate, but in your own interfaces outside
+of the CMS you have to take care of instantiate yourself:
 
 	:::php
 	// File: mysite/code/MyController.php
diff --git a/docs/en/02_Developer_Guides/03_Forms/Fields/04_GridField.md b/docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md
similarity index 100%
rename from docs/en/02_Developer_Guides/03_Forms/Fields/04_GridField.md
rename to docs/en/02_Developer_Guides/03_Forms/Field_types/04_GridField.md