diff --git a/campuscms_feature_page.features.field.inc b/campuscms_feature_page.features.field.inc
index e4629a2..559c5f3 100644
--- a/campuscms_feature_page.features.field.inc
+++ b/campuscms_feature_page.features.field.inc
@@ -256,31 +256,22 @@ function campuscms_feature_page_field_default_fields() {
     ),
   );
 
-  // Exported field: 'node-page-field_submit_buttons'
-  $fields['node-page-field_submit_buttons'] = array(
+  // Exported field: 'node-page-field_page_submit_buttons'
+  $fields['node-page-field_page_submit_buttons'] = array(
     'field_config' => array(
       'active' => '1',
       'cardinality' => '1',
       'deleted' => '0',
       'entity_types' => array(),
-      'field_name' => 'field_submit_buttons',
+      'field_name' => 'field_page_submit_buttons',
       'foreign keys' => array(),
       'indexes' => array(),
-      'module' => 'markup',
+      'module' => 'submit_field',
       'settings' => array(
-        'markup' => '<script type="text/javascript">jQuery(document).ready(function($) {
-var buttons = \'\';
-$(\'#edit-actions input\').each(function() {
-  buttons += \'<input type="button" class="form-submit" value="\' + $(this).val() + \'" onClick="document.getElementById(\\\'\' + $(this).attr(\'id\') + \'\\\').click();" />\'; 
-});
-
-$(\'#edit-field-submit-buttons\').prepend(buttons);
-});
-</script>
-<div id="edit-field-submit-buttons"></div>',
+        'submit_field' => '',
       ),
       'translatable' => '0',
-      'type' => 'markup',
+      'type' => 'submit_field',
     ),
     'field_instance' => array(
       'bundle' => 'page',
@@ -289,9 +280,9 @@ $(\'#edit-field-submit-buttons\').prepend(buttons);
       'display' => array(
         'default' => array(
           'label' => 'above',
-          'module' => 'markup',
+          'module' => NULL,
           'settings' => array(),
-          'type' => 'markup_default',
+          'type' => 'submit_field_default',
           'weight' => 3,
         ),
         'teaser' => array(
@@ -302,7 +293,7 @@ $(\'#edit-field-submit-buttons\').prepend(buttons);
         ),
       ),
       'entity_type' => 'node',
-      'field_name' => 'field_submit_buttons',
+      'field_name' => 'field_page_submit_buttons',
       'label' => 'Submit Buttons',
       'required' => 0,
       'settings' => array(
@@ -310,9 +301,9 @@ $(\'#edit-field-submit-buttons\').prepend(buttons);
       ),
       'widget' => array(
         'active' => 0,
-        'module' => 'markup',
+        'module' => 'submit_field',
         'settings' => array(),
-        'type' => 'markup',
+        'type' => 'submit_field',
         'weight' => '34',
       ),
     ),
diff --git a/campuscms_feature_page.info b/campuscms_feature_page.info
index 608b30b..9301a89 100644
--- a/campuscms_feature_page.info
+++ b/campuscms_feature_page.info
@@ -4,14 +4,14 @@ dependencies[] = "campuscms_feature_admin_toolbar_content_editor"
 dependencies[] = "campuscms_feature_admin_toolbar_site_manager"
 dependencies[] = "image"
 dependencies[] = "insert"
-dependencies[] = "markup"
 dependencies[] = "nodeformcols"
+dependencies[] = "submit_field"
 description = "Add a page to your website"
 features[ctools][] = "strongarm:strongarm:1"
 features[field][] = "node-page-body"
 features[field][] = "node-page-field_page_documents"
 features[field][] = "node-page-field_page_image"
-features[field][] = "node-page-field_submit_buttons"
+features[field][] = "node-page-field_page_submit_buttons"
 features[menu_links][] = "menu-toolbar-administrator:node/add/page"
 features[menu_links][] = "menu-toolbar-content-editor:node/add/page"
 features[menu_links][] = "menu-toolbar-site-manager:node/add/page"
diff --git a/campuscms_feature_page.strongarm.inc b/campuscms_feature_page.strongarm.inc
index 7ea1f96..03cafc5 100644
--- a/campuscms_feature_page.strongarm.inc
+++ b/campuscms_feature_page.strongarm.inc
@@ -74,11 +74,11 @@ function campuscms_feature_page_strongarm() {
       'title' => 'Documents',
       'hidden' => 0,
     ),
-    'field_submit_buttons' => array(
+    'field_page_submit_buttons' => array(
       'region' => 'right',
       'weight' => '0',
       'has_required' => FALSE,
-      'title' => 'Submit Buttions',
+      'title' => 'Submit Buttons',
       'hidden' => 0,
     ),
   );