diff --git a/application/views/helpers/FormExtensibleSet.php b/application/views/helpers/FormExtensibleSet.php
index 6768f02e..77d0da6e 100644
--- a/application/views/helpers/FormExtensibleSet.php
+++ b/application/views/helpers/FormExtensibleSet.php
@@ -138,7 +138,9 @@ class Zend_View_Helper_FormExtensibleSet extends Zend_View_Helper_FormElement
                     . $disabled
                     . $this->_htmlAttribs($attribs)
                     . $this->getClosingBracket()
+                    . '<span class="inline-buttons">'
                     . $this->renderAddButton($name, $disabled)
+                    . '</span>'
                     . '</li>';
         }
 
@@ -207,9 +209,9 @@ class Zend_View_Helper_FormExtensibleSet extends Zend_View_Helper_FormElement
         $v = $this->view;
 
         return '<input type="submit" class="related-action action-add"'
-            . ' name="' . $name . '_ADD"'
+            . ' name="' . $name . '___ADD"'
             . ' value="&#xe805;"'
-            . ' title="' . $v->translate('Remove this entry') . '"'
+            . ' title="' . $v->translate('Add a new entry') . '"'
             . $disabled
             . ' />';
     }
diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index 6d7fb791..91d98586 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -236,6 +236,10 @@ abstract class DirectorObjectForm extends QuickForm
             foreach ($values as $key => $value) {
 
                 if (substr($key, 0, 4) === 'var_') {
+                    if (substr($key, -6) === '___ADD') {
+                        continue;
+                    }
+
                     $mykey = substr($key, 4);
                     if (property_exists($fields, $mykey) && $fields->$mykey->format === 'json') {
                         $value = json_decode($value);