diff --git a/core/modules/grid/grid.module b/core/modules/grid/grid.module
index c8f7aa7..4ec1e0b 100644
--- a/core/modules/grid/grid.module
+++ b/core/modules/grid/grid.module
@@ -49,7 +49,7 @@ function grid_menu() {
   $items['admin/structure/grids/manage/%grid/edit'] = array(
     'title' => 'Edit',
     'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => -10,
+    'weight' => -10,
   );
   $items['admin/structure/grids/grid/%grid/delete'] = array(
     'title' => 'Delete',
diff --git a/core/modules/grid/lib/Drupal/grid/GridFormController.php b/core/modules/grid/lib/Drupal/grid/GridFormController.php
index 4aec9c5..e8b4f9c 100644
--- a/core/modules/grid/lib/Drupal/grid/GridFormController.php
+++ b/core/modules/grid/lib/Drupal/grid/GridFormController.php
@@ -27,7 +27,7 @@ protected function prepareEntity(EntityInterface $grid) {
       $grid->type = 'equal_column';
       $grid->options = array();
     }
-    $grid->options = $this->getPlugin()->prepareOptions($grid->options);
+    $grid->options = $grid->getPlugin()->prepareOptions($grid->options);
   }
 
   /**
@@ -54,7 +54,11 @@ public function form(array $form, array &$form_state, EntityInterface $grid) {
       '#type' => 'value',
       '#value' => $grid->type,
     );
-    $form['options'] = $this->getPlugin()->form($form, $form_state, $grid->options);
+    $form['grid'] = array(
+      '#type' => 'value',
+      '#value' => $grid,
+    );
+    $form['options'] = $grid->getPlugin()->form($form, $form_state, $grid->options);
 
     return parent::form($form, $form_state, $grid);
   }
@@ -63,7 +67,7 @@ public function form(array $form, array &$form_state, EntityInterface $grid) {
    * Overrides Drupal\Core\Entity\EntityFormController::validate().
    */
   public function validate(array $form, array &$form_state) {
-    $this->getPlugin()->validate($form, $form_state['values']['options']);
+    $form_state['values']['grid']->getPlugin()->validate($form, $form_state['values']['options']);
   }
 
   /**
diff --git a/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php b/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
index 881723c..94b631e 100644
--- a/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
+++ b/core/modules/grid/lib/Drupal/grid/Plugin/grid/grid/EqualColumn.php
@@ -95,13 +95,13 @@ public function prepareOptions(array $options) {
   /**
    * Form elements for grid editing.
    */
-  public function form(array $form, array &$form_state, array $options) {
+  public function form(array $full_form, array &$form_state, array $options) {
     // Master grid configuration.
-    $form['unit'] = array(
+    $form['units'] = array(
       '#type' => 'radios',
       '#title' => t('Grid units'),
       '#options' => array('%' => t('Percentages'), 'em' => t('Em-based'), 'px' => t('Pixel based')),
-      '#default_value' => $options['unit'],
+      '#default_value' => $options['units'],
     );
     $form['width'] = array(
       '#type' => 'textfield',