diff --git a/app/src/Extensions/EmbeddedObjectExtension.php b/app/src/Extensions/EmbeddedObjectExtension.php
index 944b847..6a4f337 100644
--- a/app/src/Extensions/EmbeddedObjectExtension.php
+++ b/app/src/Extensions/EmbeddedObjectExtension.php
@@ -3,6 +3,11 @@
 
 namespace Site\Extensions;
 
+use SilverStripe\Forms\CheckboxField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\NumericField;
+use SilverStripe\Forms\TextareaField;
+use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataExtension;
 
 class EmbeddedObjectExtension extends DataExtension
@@ -61,6 +66,29 @@ class EmbeddedObjectExtension extends DataExtension
         }
     }
 
+    public function updateCMSFields(FieldList $fields)
+    {
+        parent::updateCMSFields($fields);
+
+        $fields->removeByName([
+            'Width', 'Height', 'EmbedHTML', 'ThumbURL',
+            'Autoplay', 'Loop', 'Controls',
+            'ExtraClass', 'Type',
+        ]);
+
+        $fields->addFieldsToTab('Root.Extra', [
+            CheckboxField::create('Autoplay'),
+            CheckboxField::create('Loop'),
+            CheckboxField::create('Controls'),
+            NumericField::create('Width'),
+            NumericField::create('Height'),
+            TextareaField::create('EmbedHTML'),
+            TextField::create('ThumbURL'),
+            TextField::create('ExtraClass'),
+            TextField::create('Type'),
+        ]);
+    }
+
     public function onBeforeWrite()
     {
         parent::onBeforeWrite();