diff --git a/src/components/generated-form.cjsx b/src/components/generated-form.cjsx
index b658f6086..d0c7b4556 100644
--- a/src/components/generated-form.cjsx
+++ b/src/components/generated-form.cjsx
@@ -322,6 +322,8 @@ class GeneratedForm extends React.Component
 
     formType: React.PropTypes.oneOf(['new', 'update'])
     prefilled: React.PropTypes.bool
+    formHeader: React.PropTypes.node,
+    formFooter: React.PropTypes.node,
     contextData: React.PropTypes.object,
 
   @defaultProps:
@@ -329,8 +331,9 @@ class GeneratedForm extends React.Component
     onSubmit: ->
 
   render: =>
-    submitText = if @props.formType is "new" then "Create" else "Update"
+    submitText = if @props.formType is "new" then "Create" else "Save"
     <form className="generated-form" ref="form" style={this.props.style} onSubmit={this.props.onSubmit} onKeyDown={this._onKeyDown} noValidate>
+      {if this.props.formHeader then this.props.formHeader else false}
       <TabGroupRegion>
         {@_renderHeaderFormError()}
         {@_renderPrefilledMessage()}
@@ -338,9 +341,10 @@ class GeneratedForm extends React.Component
           {@_renderFieldsets()}
         </div>
         <div className="form-footer">
-          <button type="button" className="btn btn-emphasis" onClick={this.props.onSubmit}>
-            {submitText}
-          </button>
+          <div className="submit-button-wrap">
+            <button type="button" className="btn btn-emphasis" onClick={this.props.onSubmit}>{submitText}</button>
+          </div>
+          {if this.props.formFooter then this.props.formFooter else false}
         </div>
       </TabGroupRegion>
     </form>
diff --git a/src/pro b/src/pro
index 079eb8b1c..14a304260 160000
--- a/src/pro
+++ b/src/pro
@@ -1 +1 @@
-Subproject commit 079eb8b1c8c6d3ba9db4c01da4f56360c0dab8b1
+Subproject commit 14a30426033fbba6ccd99b743544fb01afdf1158
diff --git a/static/components/generated-form.less b/static/components/generated-form.less
index ed7da65a4..5e7eace24 100644
--- a/static/components/generated-form.less
+++ b/static/components/generated-form.less
@@ -177,9 +177,13 @@ body.is-blurred, body.platform-win32.is-blurred {
   }
 
   .form-footer {
+    display: flex;
     background: @background-off-primary;
     border-top: 1px solid darken(@background-off-primary, 7%);
     padding: 9px 22px;
+    .submit-button-wrap {
+      flex: 1;
+    }
   }
 
   .btn {