diff --git a/core/modules/field_ui/config/tour.tour.field-ui-display.yml b/core/modules/field_ui/config/tour.tour.field-ui-display.yml
index 348652f..87a61fd 100644
--- a/core/modules/field_ui/config/tour.tour.field-ui-display.yml
+++ b/core/modules/field_ui/config/tour.tour.field-ui-display.yml
@@ -19,21 +19,29 @@ tips:
     weight: "1"
     location: left
     attributes:
-      data-class: 'tabs.secondary li:first'
+      data-class: 'tabs-secondary li:first'
+  label:
+    id: label
+    plugin: text
+    label: Field label
+    body: <p>Field labels can be positioned above, inline or hidden.</p>
+    weight: "2"
+    attributes:
+      data-class: 'field-label'
   format:
     id: format
     plugin: text
-    label: Formats
-    body: <p>Formats are used to display field information in different ways.</p><p>eg. Tags can be display in plain text or link form.</p>
-    weight: "2"
+    label: Format
+    body: <p>Formats are used to display field information in different ways.</p><p>e.g. Tags can be display in plain text or link form.</p>
+    weight: "3"
     attributes:
-      data-class: 'html #field-display-overview .format'
+      data-class: 'field-format'
   custom-display-settings:
     id: format
     plugin: text
     label: Custom display settings
     body: <p>Allow for addition settings that other modules use to extend field display functionality.</p><p>Core provides the ability to enable additional view modes.</p>
-    weight: "3"
-    location: top
+    weight: "4"
+    location: "top"
     attributes:
       data-id: 'edit-modes'
diff --git a/core/modules/field_ui/config/tour.tour.field-ui-fields.yml b/core/modules/field_ui/config/tour.tour.field-ui-fields.yml
index 725834b..0023fdd 100644
--- a/core/modules/field_ui/config/tour.tour.field-ui-fields.yml
+++ b/core/modules/field_ui/config/tour.tour.field-ui-fields.yml
@@ -19,19 +19,21 @@ tips:
     weight: "1"
     attributes:
       data-class: 'html #field-overview th.field-type'
+  operations:
+    id: operations
+    plugin: text
+    label: Operations
+    body: Edit, delete and manage field settings
+    weight: "3"
+    location: "left"
+    attributes:
+      data-class: 'html #field-overview th.field-operations'
   add-new-field:
     id: add-new-field
     plugin: text
     label: Add new field
     body: To create a new field a label, type and widget need to be provided. The label field will automatically fill out the machine name field. While the Field Type will filter the Widget dropdown.
-    weight: "3"
-    attributes:
-      data-id: edit-fields-add-new-field-label
-  add-existing-field:
-    id: add-existing-field
-    plugin: text
-    label: Add existing field
-    body: Previously created fields can be reused on other content types. This allows for consistency across content type forms.
     weight: "4"
+    location: "top"
     attributes:
-      data-id: edit-fields-add-existing-field-label
+      data-id: edit-fields-add-new-field-label
diff --git a/core/modules/field_ui/config/tour.tour.field-ui-form-display.yml b/core/modules/field_ui/config/tour.tour.field-ui-form-display.yml
new file mode 100644
index 0000000..179e7d3
--- /dev/null
+++ b/core/modules/field_ui/config/tour.tour.field-ui-form-display.yml
@@ -0,0 +1,21 @@
+id: field-ui-form-display
+label: Field UI form display
+module: field_ui
+langcode: en
+paths:
+  - admin/structure/types/manage/*/form-display
+tips:
+  introduction:
+    id: introduction
+    plugin: text
+    label: Manage form display
+    body: <p>This page is used to manage how the field forms will be displayed when editing content.</p><p>Tasks that can be performed include:</p><ul><li>Change the widget for entering field data.</li><li>Arranging the order in which fields are displayed.</li></ul>
+    weight: "0"
+  widget:
+    id: widget
+    plugin: text
+    label: Widget
+    body: <p>Widgets allow you to specify how you enter the information.</p><p>eg. For options list, use a checkbox or select list.</p>
+    weight: "1"
+    attributes:
+      data-class: 'field-widget'
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 0d68e77..aeb17f6 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -151,8 +151,8 @@ protected function getTableHeader() {
       $this->t('Field'),
       $this->t('Weight'),
       $this->t('Parent'),
-      $this->t('Label'),
-      array('data' => $this->t('Format'), 'colspan' => 3),
+      array('data' => $this->t('Label'), 'class' => 'field-label'),
+      array('data' => $this->t('Format'), 'colspan' => 3, 'class' => 'field-format'),
     );
   }
 
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index 4a63ea4..c39fbae 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -107,7 +107,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
         $this->t('Label'),
         $this->t('Machine name'),
         array('data' => $this->t('Field type'), 'class' => 'field-type'),
-        $this->t('Operations'),
+        array('data' => $this->t('Operations'), 'class' => 'field-operations'),
       ),
       '#regions' => $this->getRegions(),
       '#attributes' => array(
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
index a1e8d8b..fb3d591 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
@@ -118,7 +118,7 @@ protected function getTableHeader() {
       $this->t('Field'),
       $this->t('Weight'),
       $this->t('Parent'),
-      array('data' => $this->t('Widget'), 'colspan' => 3),
+      array('data' => $this->t('Widget'), 'colspan' => 3, 'class' => 'field-widget'),
     );
   }