diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb
index 5204126..bfebccb 100644
--- a/app/views/contact_us/contacts/new.html.erb
+++ b/app/views/contact_us/contacts/new.html.erb
@@ -1,8 +1,5 @@
-<script type="text/javascript">
- var RecaptchaOptions = {
-    theme : "clean"
- };
-</script>
+<% javascript "contacts/new_contact.js" %>
+
 <h1>
   <%= _("Contact Us") %>
 </h1>
@@ -15,64 +12,69 @@
   <!-- left column  content -->
   <div class="column_left">
     <div class="white_background">
-      <%= form_for @contact, :url => contacts_path do |f| %>
-        <div class="dmp_details">
-          <fieldset class="side-by-side">
-            <% if ContactUs.require_name %>
-              <div>
-                <%= f.label :name, (_('Name') + content_tag(:abbr, "*", class: "required")).html_safe %>
-                <% if user_signed_in? then %>
-                  <%= f.text_field :name, value: current_user.name(false) %>
-                <% else %>
-                  <%= f.text_field :name %>
-                <% end %>
-                <% if f.object.errors[:name].present? %>
-                  <p class="inline-error"><%= f.object.errors[:name].join(_(" and ")) %></p>
-                <% end %>
-              </div>
-            <% end %>
-            
+      <%= form_for @contact, url: contacts_path, html: {class: "roadmap-form"} do |f| %>
+        <fieldset class="side-by-side">
+          <% if ContactUs.require_name %>
             <div>
-              <%= f.label :email, (_('Email') + content_tag(:abbr, "*", class: "required")).html_safe %>
+              <%= f.label :name, (_('Name') + content_tag(:abbr, "*", class: "required")).html_safe %>
               <% if user_signed_in? then %>
-                <%= f.email_field :email, value: current_user.email %>
+                <%= f.text_field :name, value: current_user.name(false) %>
               <% else %>
-                <%= f.email_field :email %>
+                <%= f.text_field :name %>
               <% end %>
-              <% if f.object.errors[:email].present? %>
-                <p class="inline-error"><%= f.object.errors[:email].join(_(" and ")) %></p>
+              <% if f.object.errors[:name].present? %>
+                <p class="inline-error"><%= f.object.errors[:name].join(_(" and ")) %></p>
               <% end %>
             </div>
-            
-            <% if ContactUs.require_subject %>
-              <div>
-                <%= f.label :subject, (_('Subject') + content_tag(:abbr, "*", class: "required")).html_safe %>
-                <%= f.text_field :subject %>
-                <% if f.object.errors[:subject].present? %>
-                  <p class="inline-error"><%= f.object.errors[:subject].join(_(" and ")) %></p>
-                <% end %>
-              </div>
+          <% end %>
+          
+          <div>
+            <%= f.label :email, (_('Email') + content_tag(:abbr, "*", class: "required")).html_safe %>
+            <% if user_signed_in? then %>
+              <%= f.email_field :email, value: current_user.email %>
+            <% else %>
+              <%= f.email_field :email %>
             <% end %>
-            
+            <% if f.object.errors[:email].present? %>
+              <p class="inline-error"><%= f.object.errors[:email].join(_(" and ")) %></p>
+            <% end %>
+          </div>
+          
+          <% if ContactUs.require_subject %>
             <div>
-              <%= f.label :message, (_('Message') + content_tag(:abbr, "*", class: "required")).html_safe %>
-              <%= f.text_area :message, rows: 10, class: "input-large" %>
-              <% if f.object.errors[:message].present? %>
-                <p class="inline-error"><%= f.object.errors[:message].join(_(" and ")) %></p>
+              <%= f.label :subject, (_('Subject') + content_tag(:abbr, "*", class: "required")).html_safe %>
+              <%= f.text_field :subject %>
+              <% if f.object.errors[:subject].present? %>
+                <p class="inline-error"><%= f.object.errors[:subject].join(_(" and ")) %></p>
               <% end %>
             </div>
-            
-            <% if !user_signed_in? then %>
-              <div>
-                <%= t('helpers.security_check') %>
-                <%= recaptcha_tags %>
-              </div>
+          <% end %>
+          
+          <div>
+            <%= f.label :message, (_('Message') + content_tag(:abbr, "*", class: "required")).html_safe %>
+            <%= f.text_area :message, rows: 10, class: "input-large" %>
+            <% if f.object.errors[:message].present? %>
+              <p class="inline-error"><%= f.object.errors[:message].join(_(" and ")) %></p>
             <% end %>
-          </fieldset>
-        </div>
-        
-        <div class="button-spacer"></div>
-        <input type="submit" class="form-submit" value="<%= _('Save') %>" />
+          </div>
+          
+          <% if !user_signed_in? then %>
+            <div>
+              <%= t('helpers.security_check') %>
+              <%= recaptcha_tags %>
+            </div>
+          <% end %>
+					
+					<div>
+		        <div class="button-spacer"></div>
+				    <%= render partial: 'shared/accessible_submit_button',
+				               locals: {id: 'create_contact_submit', 
+												        val: 'Submit', 
+												        disabled_initially: true,
+																tooltip: _('Fill in required fields')} %>
+					</div>
+        </fieldset>
+
       <% end %>
     </div>
   </div>
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index 11f8356..ea291b9 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -1,4 +1,4 @@
-<% javascript "plans/create_plan.js" %>
+<% javascript "plans/new_plan.js" %>
 
 <div class="main">
   <h1><%= _('Create a new plan') %></h1>
@@ -80,7 +80,10 @@
     <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
     
     <%= render partial: 'shared/accessible_submit_button',
-               locals: {id: 'create_plan_submit', val: 'Create Plan', disabled_initially: true} %>
+               locals: {id: 'create_plan_submit', 
+                         val: 'Create Plan', 
+                        disabled_initially: true,
+                        tooltip: _('You can not continue until you have filled in all of the required information.')} %>
 
   <% end %>
 </div>
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index d3a48ec..2966a91 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -7,9 +7,7 @@
 
 <div role="tooltip" id="<%= id %>_tip" class="submit-tooltip">
   <div class="arrow-left"></div>
-  <span class="submit-tooltip-msg">
-    <%= _('You can not continue until you have filled in all of the required information.') %>
-  </span>
+  <span class="submit-tooltip-msg"><%= tooltip %></span>
 </div>
 
 <script type="text/javascript">
diff --git a/config/application.rb b/config/application.rb
index 5859929..74cd0c9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,10 +75,13 @@
     config.assets.precompile += %w(jquery-accessible-autocomplet-list-aria.js)
     config.assets.precompile += %w(export_configure.js)
     config.assets.precompile += %w(toolbar.js)
-    config.assets.precompile += %w(plans/create_plan.js)
     config.assets.precompile += %w(admin.js)
     config.assets.precompile += %w(admin.css)
     
+    config.assets.precompile += %w(roadmap-form.scss)
+    config.assets.precompile += %w(plans/new_plan.js)
+    config.assets.precompile += %w(contacts/new_contact.js)
+    
     config.autoload_paths += %W(#{config.root}/lib)
     config.action_controller.include_all_helpers = true
 
diff --git a/lib/assets/javascripts/contacts/new_contact.js b/lib/assets/javascripts/contacts/new_contact.js
new file mode 100644
index 0000000..1b692e2
--- /dev/null
+++ b/lib/assets/javascripts/contacts/new_contact.js
@@ -0,0 +1,14 @@
+var RecaptchaOptions = {
+  theme : "clean"
+};
+
+$(document).ready(function(){
+  $("input[type='text'], input[type='email'], textarea").change(function(e){
+    var enable = ($("#contact_us_contact_name").val().trim().length > 0 &&
+                  $("#contact_us_contact_email").val().trim().length > 0 &&
+                  $("#contact_us_contact_subject").val().trim().length > 0 &&
+                  $("#contact_us_contact_message").val().trim().length > 0);
+    
+    $("#create_contact_submit").attr('aria-disabled', !enable);
+  });
+});
\ No newline at end of file
diff --git a/lib/assets/javascripts/plans/create_plan.js b/lib/assets/javascripts/plans/create_plan.js
deleted file mode 100644
index 7bf6e19..0000000
--- a/lib/assets/javascripts/plans/create_plan.js
+++ /dev/null
@@ -1,65 +0,0 @@
-$(document).ready(function(){
-  $("#available-templates").hide();
-
-  // retrieve the template options and toggle the submit button on page reload
-  handleComboboxChange();
-  handleCheckboxClick("org", $("#plan_no_org").prop("checked"));
-  handleCheckboxClick("funder", $("#plan_no_funder").prop("checked"));
-  
-  // When the hidden org and funder id fields change toogle the submit button
-  $("#plan_org_id, #plan_funder_id").change(function(){
-    handleComboboxChange();
-  });
-
-  // Make sure the checkbox is unchecked if we're entering text
-  $(".js-combobox").keyup(function(){
-    var whichOne = $(this).prop('id').split('_')[1];
-    $("#plan_no_" + whichOne).prop("checked", false);
-  });
-
-  // If the user clicks the no Org/Funder checkbox disable the dropdown 
-  // and hide clear button
-  $("#plan_no_org, #plan_no_funder").click(function(){
-    var whichOne = $(this).prop('id').split('_')[2];
-    handleCheckboxClick(whichOne, this.checked);
-  });
-  
-  $("#plan_template_id").change(function(){
-    $("#create_plan_submit").attr('aria-disabled', ($(this).val().trim().length <= 0));
-  });
-});
-
-// Only display the submit button if the user has made each decision
-// -------------------------------------------------------------
-function handleComboboxChange(){
-  // If the (no_org checkbox is checked OR an org was selected) AND
-  //        (no_funder checkbox is checked OR a funder was selected) AND
-  //        (the template selector is not visible OR a template has been selected)
-  var retrieve = ($("#plan_no_org").prop("checked") || 
-                  $("#plan_org_id").val().trim().length > 0) &&
-                 ($("#plan_no_funder").prop("checked") || 
-                  $("#plan_funder_id").val().trim().length > 0);
-  
-  if(retrieve){
-    if($("#plan_template_id").val().trim().length <= 0){
-      $("form").submit();
-    }
-    
-  }else{
-    $("#available-templates").fadeOut();
-    $("#plan_template_id").val("");
-  }
-}
-
-// Clear the combobox and disable it if the box was checked
-// -------------------------------------------------------------
-function handleCheckboxClick(name, checked){
-  $("#plan_" + name + "_name").prop("disabled", checked);
-  $("#plan_template_id").val("").change();
-
-  if(checked){
-    $("#plan_" + name + "_name").val("");
-    $("#plan_" + name + "_id").val("").change();
-    $("#plan_" + name + "_name").siblings(".combobox-clear-button").hide();
-  }
-}
diff --git a/lib/assets/javascripts/plans/new_plan.js b/lib/assets/javascripts/plans/new_plan.js
new file mode 100644
index 0000000..7bf6e19
--- /dev/null
+++ b/lib/assets/javascripts/plans/new_plan.js
@@ -0,0 +1,65 @@
+$(document).ready(function(){
+  $("#available-templates").hide();
+
+  // retrieve the template options and toggle the submit button on page reload
+  handleComboboxChange();
+  handleCheckboxClick("org", $("#plan_no_org").prop("checked"));
+  handleCheckboxClick("funder", $("#plan_no_funder").prop("checked"));
+  
+  // When the hidden org and funder id fields change toogle the submit button
+  $("#plan_org_id, #plan_funder_id").change(function(){
+    handleComboboxChange();
+  });
+
+  // Make sure the checkbox is unchecked if we're entering text
+  $(".js-combobox").keyup(function(){
+    var whichOne = $(this).prop('id').split('_')[1];
+    $("#plan_no_" + whichOne).prop("checked", false);
+  });
+
+  // If the user clicks the no Org/Funder checkbox disable the dropdown 
+  // and hide clear button
+  $("#plan_no_org, #plan_no_funder").click(function(){
+    var whichOne = $(this).prop('id').split('_')[2];
+    handleCheckboxClick(whichOne, this.checked);
+  });
+  
+  $("#plan_template_id").change(function(){
+    $("#create_plan_submit").attr('aria-disabled', ($(this).val().trim().length <= 0));
+  });
+});
+
+// Only display the submit button if the user has made each decision
+// -------------------------------------------------------------
+function handleComboboxChange(){
+  // If the (no_org checkbox is checked OR an org was selected) AND
+  //        (no_funder checkbox is checked OR a funder was selected) AND
+  //        (the template selector is not visible OR a template has been selected)
+  var retrieve = ($("#plan_no_org").prop("checked") || 
+                  $("#plan_org_id").val().trim().length > 0) &&
+                 ($("#plan_no_funder").prop("checked") || 
+                  $("#plan_funder_id").val().trim().length > 0);
+  
+  if(retrieve){
+    if($("#plan_template_id").val().trim().length <= 0){
+      $("form").submit();
+    }
+    
+  }else{
+    $("#available-templates").fadeOut();
+    $("#plan_template_id").val("");
+  }
+}
+
+// Clear the combobox and disable it if the box was checked
+// -------------------------------------------------------------
+function handleCheckboxClick(name, checked){
+  $("#plan_" + name + "_name").prop("disabled", checked);
+  $("#plan_template_id").val("").change();
+
+  if(checked){
+    $("#plan_" + name + "_name").val("");
+    $("#plan_" + name + "_id").val("").change();
+    $("#plan_" + name + "_name").siblings(".combobox-clear-button").hide();
+  }
+}
diff --git a/lib/assets/stylesheets/application.css b/lib/assets/stylesheets/application.css
index 8abb6aa..becfdeb 100644
--- a/lib/assets/stylesheets/application.css
+++ b/lib/assets/stylesheets/application.css
@@ -14,5 +14,5 @@
  *= require bootstrap.css
  *= require select2.css
  *= require bootstrap_and_overrides.css.less
- *= require dmproadmap.scss
+ *= require roadmap-form.scss
  */
\ No newline at end of file
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
deleted file mode 100644
index a9ebd9c..0000000
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ /dev/null
@@ -1,280 +0,0 @@
-@import "font-awesome";
-
-$font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-$header-font: "GillSansLight";
-
-$white: #FFF;
-$dark-grey: #333;
-
-$primary-color: #F49700;
-$primary-admin-color: #0057A7;
-$disabled-button-color: #CCC;
-$cancel-button-color: #CCC;
-$reverse-text: #FFF;
-
-/* See `.combobox-clear-button` for an example of this mixin in use */
-@mixin icon($icon) {
-  @extend .fa;
-  @extend .fa-#{$icon}:before;
-}
-
-.input-large {
-  width: 550px;
-}
-.input-medium {
-  width: 206px;
-}
-.input-small {
-  width: 110px;
-}
-
-.left-indent {
-  margin-left: 15px;
-}
-
-div.inline {
-  display: inline-block;
-}
-
-.arrow-left {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  border-top: 12px solid transparent;
-  border-bottom: 12px solid transparent;
-  border-right: 12px solid $dark-grey;
-}
-
-.main_header {
-  margin-bottom: 20px;
-}
-
-.content-box {
-  background-color: $white;
-
-  padding: 20px 15px 35px 15px;
-
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/* Accessible Form Buttons */
-/* ------------------------------------------------------ */
-input.form-submit {
-  background-color: $primary-color;
-  color: $reverse-text;
-  padding: 10px 30px;
-  font-size: 12pt;
-  
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-/* Override the button color for the Org Admin sections */
-input[type="submit"].admin{
-  background-color: $primary-admin-color;
-}
-input.form-submit[aria-disabled='true'] {
-  background-color: $disabled-button-color;
-}
-input.form-submit:focus + [role="tooltip"] {
-  display: inline-block;
-}
-input.inline[type="submit"] {
-  font-size: 10pt;
-  padding: 5px 15px;
-}
-button.form-cancel {
-  background-color: $cancel-button-color;
-  color: $reverse-text;
-  padding: 10px 30px;
-  font-size: 12pt;
-  
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-.submit-tooltip {
-  display: none;
-  margin-left: 5px;
-
-  .arrow-left {
-    vertical-align: middle;
-    margin-right: -5px;
-  }
-  .submit-tooltip-msg {
-    color: $white;
-    background-color: $dark-grey;
-    padding: 5px 5px 8px 5px;
-  
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-  }
-}
-
-/* Generic Fieldset Settings */
-/* ------------------------------------------------------ */
-fieldset legend {
-  font-family: $header-font;
-  color: $primary-color;
-  font-size: 26px;
-  font-weight: normal;
-  text-decoration: none;
-  
-  float: left; /* positions the legend within the fieldset box */
-  padding-top: 20px;
-  border-bottom: none;
-}
-
-/* Standard Form - Labels above Fields */
-/* ------------------------------------------------------ */
-.main {
-  form {
-    .white-fieldset {
-      background-color: $white;
-      padding: 0 25px 25px 25px;
-      margin-bottom: 25px;
-      
-      -webkit-border-radius: 10px;
-      -moz-border-radius: 10px;
-      border-radius: 10px;
-      
-      label, 
-      input[type="checkbox"], 
-      .combobox-container, 
-      .left-indent {
-        margin-left: 15px;
-      }
-      
-      input[type="text"], select {
-        margin-bottom: 15px;
-      }
-      
-      input[type="checkbox"] {
-        vertical-align: top;
-      }
-      
-      .checkbox-label {
-        display: inline-block;
-        margin-left: 5px;
-      }
-    }
-  }
-}
-
-/* Embedded Form - Labels to the left of fields */
-/* ------------------------------------------------------ */
-form.side-by-side {
-  div {
-    fieldset {
-      .mce-tinymce {
-        display: inline-block;
-      }
-      
-      div {
-        margin-left: 15px;
-        
-        label,
-        input[type="checkbox"], 
-        .combobox-container, 
-        .identifier-scheme {
-          display: inline-block;
-        }
-  
-        .identifier-scheme-indent {
-          margin-left: -5px;
-        }
-        
-        label {
-          width: 20%;
-          text-align: right;
-          margin-right: 10px;
-          vertical-align: middle;
-        }
-  
-        input.form-submit, 
-        button.form-cancel {
-          font-size: 10pt;
-        }
-      }
-    }
-  }
-
-  .button-spacer {
-    display: inline-block;
-    width: 21%;
-  }
-  
-  .button-spacer-large {
-    display: inline-block;
-    width: 21%;
-  }
-  
-  input.form-submit,
-  button.form-cancel {
-    font-size: 11pt;
-    padding: 10px 10px 10px 10px;
-  }
-}
-
-/* Accessible JQuery combobox */
-/* ------------------------------------------------------ */
-.invisible {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-.combobox-container {
-  position: relative;
-  max-width: 585px;
-  
-  font-family: $font-family;
-}
-
-.combobox-suggestions {
-  position: absolute;
-  left: 0;
-  width: 562px;
-  margin-top: -10px;
-  background: #fff;
-  z-index: 99;
-}
-.combobox-suggestion {
-  color: #666;
-  border-bottom: 1px solid #000;
-  border-left: 1px solid #000;
-  border-right: 1px solid #000;
-  padding: 5px 10px 5px 10px;
-  cursor: pointer;
-  text-align: left;
-}
-.combobox-suggestion:first-child {
-  border-top: 1px solid #000;
-}
-.combobox-suggestion:hover,
-.combobox-suggestion:focus {
-  color: $white;
-  background-color: $primary-color;
-}
-
-.combobox-clear-button {
-  @include icon(times-circle);
-  display: inline;
-  position: absolute;
-  border: none;
-  background: transparent;
-  padding-top: 3px;
-  font-size: 16pt;
-}
-
-/* http://geektnt.com/how-to-remove-x-from-search-input-field-on-chrome-and-ie.html */
-.js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; }
-.js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; }
\ No newline at end of file
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
new file mode 100644
index 0000000..440c13e
--- /dev/null
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -0,0 +1,248 @@
+@import "font-awesome";
+
+$font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+$header-font: "GillSansLight";
+
+$white: #FFF;
+$dark-grey: #333;
+
+$primary-color: #F49700;
+$primary-admin-color: #0057A7;
+$disabled-button-color: #CCC;
+$cancel-button-color: #CCC;
+$reverse-text: #FFF;
+
+/* See `.combobox-clear-button` for an example of this mixin in use */
+@mixin icon($icon) {
+  @extend .fa;
+  @extend .fa-#{$icon}:before;
+}
+
+.arrow-left {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border-top: 12px solid transparent;
+  border-bottom: 12px solid transparent;
+  border-right: 12px solid $dark-grey;
+}
+
+.main_header {
+  margin-bottom: 20px;
+}
+
+.content-box {
+  background-color: $white;
+
+  padding: 20px 15px 35px 15px;
+
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/* Roadmap Form Styling */
+/* ------------------------------------------------ */
+form.roadmap-form {
+  padding: 0 25px 25px 25px;
+  margin-bottom: 25px;
+	
+	/* Fieldset with labels over inputs */
+	fieldset.standard {
+    label, 
+    input[type="checkbox"], 
+    .combobox-container, 
+    .left-indent {
+      margin-left: 15px;
+    }
+    
+    input[type="text"], select {
+      margin-bottom: 15px;
+    }
+    
+    input[type="checkbox"] {
+      vertical-align: top;
+    }
+    
+    .checkbox-label {
+      display: inline-block;
+      margin-left: 5px;
+    }
+	}
+	
+	/* Fieldset with labels to the left of inputs */
+	fieldset.side-by-side {
+    .mce-tinymce {
+      display: inline-block;
+    }
+    
+    div {
+      label,
+      input[type="checkbox"], 
+      .combobox-container, 
+      .identifier-scheme {
+        display: inline-block;
+      }
+
+      .identifier-scheme-indent {
+        margin-left: -5px;
+      }
+      
+      label {
+        width: 20%;
+        text-align: right;
+        margin-right: 10px;
+        vertical-align: middle;
+      }
+
+      input.form-submit, 
+      button.form-cancel {
+        font-size: 10pt;
+      }
+    }
+		
+	  .button-spacer {
+	    display: inline-block;
+	    width: 21%;
+	  }
+	}
+	
+	/* Generic Fieldset Settings */
+	fieldset legend {
+	  font-family: $header-font;
+	  color: $primary-color;
+	  font-size: 26px;
+	  font-weight: normal;
+	  text-decoration: none;
+  
+	  float: left; /* positions the legend within the fieldset box */
+	  padding-top: 20px;
+	  border-bottom: none;
+	}
+	
+	div.inline {
+	  display: inline-block;
+	}
+	.left-indent {
+		margin-left: 15px;
+	}
+	.input-large {
+	  width: 70%;
+	}
+	.input-medium {
+	  width: 50%;
+	}
+	.input-small {
+	  width: 20%;
+	}
+	
+	/* Accessible Form Buttons */
+	input.form-submit {
+	  background-color: $primary-color;
+	  color: $reverse-text;
+	  padding: 10px 30px;
+	  font-size: 12pt;
+  
+	  -webkit-border-radius: 10px;
+	  -moz-border-radius: 10px;
+	  border-radius: 10px;
+	}
+	/* Override the button color for the Org Admin sections */
+	input[type="submit"].admin{
+	  background-color: $primary-admin-color;
+	}
+	input.form-submit[aria-disabled='true'] {
+	  background-color: $disabled-button-color;
+	}
+	input.form-submit:focus + [role="tooltip"] {
+	  display: inline-block;
+	}
+	button.form-cancel {
+	  background-color: $cancel-button-color;
+	  color: $reverse-text;
+	  padding: 10px 30px;
+	  font-size: 12pt;
+  
+	  -webkit-border-radius: 10px;
+	  -moz-border-radius: 10px;
+	  border-radius: 10px;
+	}
+	.submit-tooltip {
+	  display: none;
+	  margin-left: 5px;
+
+	  .arrow-left {
+	    vertical-align: middle;
+	    margin-right: -5px;
+	  }
+	  .submit-tooltip-msg {
+	    color: $white;
+	    background-color: $dark-grey;
+	    padding: 5px 5px 8px 5px;
+  
+	    -webkit-border-radius: 5px;
+	    -moz-border-radius: 5px;
+	    border-radius: 5px;
+	  }
+	}
+}
+
+/* Accessible JQuery combobox */
+/* ------------------------------------------------------ */
+.invisible {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+
+.combobox-container {
+  position: relative;
+  max-width: 585px;
+  
+  font-family: $font-family;
+}
+
+.combobox-suggestions {
+  position: absolute;
+  left: 0;
+  width: 562px;
+  margin-top: -10px;
+  background: #fff;
+  z-index: 99;
+}
+.combobox-suggestion {
+  color: #666;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #000;
+  border-right: 1px solid #000;
+  padding: 5px 10px 5px 10px;
+  cursor: pointer;
+  text-align: left;
+}
+.combobox-suggestion:first-child {
+  border-top: 1px solid #000;
+}
+.combobox-suggestion:hover,
+.combobox-suggestion:focus {
+  color: $white;
+  background-color: $primary-color;
+}
+
+.combobox-clear-button {
+  @include icon(times-circle);
+  display: inline;
+  position: absolute;
+  border: none;
+  background: transparent;
+  padding-top: 3px;
+  font-size: 16pt;
+}
+
+/* http://geektnt.com/how-to-remove-x-from-search-input-field-on-chrome-and-ie.html */
+.js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; }
+.js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; }
\ No newline at end of file