diff --git a/code/Form/UserFormsGridFieldFilterHeader.php b/code/Form/UserFormsGridFieldFilterHeader.php
index 2b96fdf..dfe2a96 100644
--- a/code/Form/UserFormsGridFieldFilterHeader.php
+++ b/code/Form/UserFormsGridFieldFilterHeader.php
@@ -91,9 +91,7 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader
         )));
 
         foreach (array($start, $end) as $date) {
-            $date->setConfig('showcalendar', true);
-            $date->setConfig('dateformat', 'y-mm-dd');
-            $date->setConfig('datavalueformat', 'y-mm-dd');
+            $date->setDateFormat('y-mm-dd');
             $date->addExtraClass('no-change-track');
         }
 
@@ -121,7 +119,7 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader
 
 
         return array(
-            'header' => $forTemplate->renderWith('GridFieldFilterHeader_Row')
+            'header' => $forTemplate->renderWith(GridFieldFilterHeader::class . '_Row')
         );
     }
 
diff --git a/code/FormField/UserFormsCompositeField.php b/code/FormField/UserFormsCompositeField.php
index bef9624..c1bf8ac 100644
--- a/code/FormField/UserFormsCompositeField.php
+++ b/code/FormField/UserFormsCompositeField.php
@@ -11,7 +11,6 @@ use SilverStripe\UserForms\Model\EditableFormField\EditableFormStep;
  */
 abstract class UserFormsCompositeField extends CompositeField implements UserFormsFieldContainer
 {
-
     /**
      * Parent field
      *
@@ -38,10 +37,11 @@ abstract class UserFormsCompositeField extends CompositeField implements UserFor
         }
 
         // Skip over fields that don't generate formfields
-        $formField = $field->getFormField();
-        if (!$formField) {
+        if (get_class($field) === EditableFormField::class || !$field->getFormField()) {
             return $this;
         }
+        /** @var EditableFormField $formField */
+        $formField = $field->getFormField();
 
         // Save this field
         $this->push($formField);
diff --git a/code/Model/EditableFormField/EditableCountryDropdownField.php b/code/Model/EditableFormField/EditableCountryDropdownField.php
index 36f6a85..3871286 100644
--- a/code/Model/EditableFormField/EditableCountryDropdownField.php
+++ b/code/Model/EditableFormField/EditableCountryDropdownField.php
@@ -3,7 +3,8 @@
 namespace SilverStripe\UserForms\Model\EditableFormField;
 
 use SilverStripe\Core\Manifest\ModuleLoader;
-use CountryDropdownField; // @todo
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\i18n\i18n;
 use SilverStripe\UserForms\Model\EditableCustomRule;
 use SilverStripe\UserForms\Model\EditableFormField;
 
@@ -34,7 +35,8 @@ class EditableCountryDropdownField extends EditableFormField
 
     public function getFormField()
     {
-        $field = CountryDropdownField::create($this->Name, $this->EscapedTitle)
+        $field = DropdownField::create($this->Name, $this->EscapedTitle)
+            ->setSource(i18n::getData()->getCountries())
             ->setFieldHolderTemplate('UserFormsField_holder')
             ->setTemplate('UserFormsDropdownField');
 
diff --git a/code/Model/EditableFormField/EditableDateField.php b/code/Model/EditableFormField/EditableDateField.php
index 494de03..8cd09b5 100755
--- a/code/Model/EditableFormField/EditableDateField.php
+++ b/code/Model/EditableFormField/EditableDateField.php
@@ -59,7 +59,6 @@ class EditableDateField extends EditableFormField
             : $this->Default;
 
         $field = FormField::create($this->Name, $this->EscapedTitle, $defaultValue)
-            ->setConfig('showcalendar', true)
             ->setFieldHolderTemplate('UserFormsField_holder')
             ->setTemplate('UserFormsField');
 
diff --git a/code/Model/EditableFormField/EditableDateField/FormField.php b/code/Model/EditableFormField/EditableDateField/FormField.php
index 5c58963..7a6b246 100644
--- a/code/Model/EditableFormField/EditableDateField/FormField.php
+++ b/code/Model/EditableFormField/EditableDateField/FormField.php
@@ -11,6 +11,6 @@ class FormField extends DateField
 {
     public function Type()
     {
-        return "date-alt text";
+        return 'date-alt text';
     }
 }
diff --git a/code/Model/EditableFormField/EditableFormHeading.php b/code/Model/EditableFormField/EditableFormHeading.php
index d4a93ef..0df4b81 100644
--- a/code/Model/EditableFormField/EditableFormHeading.php
+++ b/code/Model/EditableFormField/EditableFormHeading.php
@@ -68,7 +68,7 @@ class EditableFormHeading extends EditableFormField
 
     public function getFormField()
     {
-        $labelField = HeaderField::create($this->EscapedTitle)
+        $labelField = HeaderField::create('userforms-header', $this->EscapedTitle)
             ->setHeadingLevel($this->Level);
         $labelField->addExtraClass('FormHeading');
         $labelField->setAttribute('data-id', $this->Name);
diff --git a/code/Model/UserDefinedForm.php b/code/Model/UserDefinedForm.php
index d0c9b6c..30a3b5e 100755
--- a/code/Model/UserDefinedForm.php
+++ b/code/Model/UserDefinedForm.php
@@ -173,7 +173,7 @@ class UserDefinedForm extends Page
     public function getCMSFields()
     {
         Requirements::css(
-            ModuleLoader::getModule('silverstripe/userforms')->getRelativeResourcePath('css/UserForms_cms.css')
+            ModuleLoader::getModule('silverstripe/userforms')->getRelativeResourcePath('css/UserForm_cms.css')
         );
 
         $this->beforeUpdateCMSFields(function ($fields) {
diff --git a/docs/en/compiling-front-end-files.md b/docs/en/compiling-front-end-files.md
index 41a5b39..8918f0b 100644
--- a/docs/en/compiling-front-end-files.md
+++ b/docs/en/compiling-front-end-files.md
@@ -22,7 +22,7 @@ $ gem install compass
 
 ## Compile assets
 
-Make your changes to `scss/UserForms.scss` or `scss/UserForms_cms.scss`. Then navigate to the `userforms` folder and run:
+Make your changes to `scss/UserForm.scss` or `scss/UserForm_cms.scss`. Then navigate to the `userforms` folder and run:
 
 ```sh
 $ compass compile